From f7fdb4492b144e1b898af92ef4605b6a19240777 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Wed, 7 Mar 2018 12:18:42 -0800
Subject: [PATCH] Generated from 5719957f1126730f07e4f7dd80d04cc545ba7345
 (#1209)

Build Network with Autorest.Python 3.0
---
 .../mgmt/2015-05-01-preview/network/models.go |  130 +
 .../2015-05-01-preview/network/version.go     |    6 +-
 .../network/mgmt/2015-06-15/network/models.go |  145 +
 .../mgmt/2015-06-15/network/version.go        |    6 +-
 .../network/mgmt/2016-03-30/network/models.go |  150 ++
 .../mgmt/2016-03-30/network/version.go        |    6 +-
 .../network/mgmt/2016-06-01/network/models.go |  170 ++
 .../mgmt/2016-06-01/network/version.go        |    6 +-
 .../network/mgmt/2016-09-01/network/models.go |  230 ++
 .../mgmt/2016-09-01/network/version.go        |    6 +-
 .../network/mgmt/2016-12-01/network/models.go |  230 ++
 .../mgmt/2016-12-01/network/version.go        |    6 +-
 ...ateways.go => applicationgatewaysgroup.go} |  154 +-
 ...ities.go => bgpservicecommunitiesgroup.go} |   40 +-
 .../network/mgmt/2017-03-01/network/client.go |   72 -
 ...expressroutecircuitauthorizationsgroup.go} |   82 +-
 ...go => expressroutecircuitpeeringsgroup.go} |   79 +-
 ...rcuits.go => expressroutecircuitsgroup.go} |  166 +-
 ...o => expressrouteserviceprovidersgroup.go} |   43 +-
 .../network/mgmt/2017-03-01/network/group.go  |  109 +
 .../{interfaces.go => interfacesgroup.go}     |  188 +-
 ...loadbalancers.go => loadbalancersgroup.go} |  102 +-
 ...teways.go => localnetworkgatewaysgroup.go} |   84 +-
 .../network/mgmt/2017-03-01/network/models.go | 1625 +++++++-----
 ...cketcaptures.go => packetcapturesgroup.go} |   94 +-
 ...addresses.go => publicipaddressesgroup.go} |  166 +-
 ...ilterrules.go => routefilterrulesgroup.go} |   92 +-
 .../{routefilters.go => routefiltersgroup.go} |  114 +-
 .../network/{routes.go => routesgroup.go}     |   78 +-
 .../{routetables.go => routetablesgroup.go}   |  102 +-
 ...curitygroups.go => securitygroupsgroup.go} |  102 +-
 ...securityrules.go => securityrulesgroup.go} |   80 +-
 .../network/{subnets.go => subnetsgroup.go}   |   78 +-
 .../network/{usages.go => usagesgroup.go}     |   42 +-
 .../mgmt/2017-03-01/network/version.go        |    6 +-
 ... virtualnetworkgatewayconnectionsgroup.go} |  125 +-
 ...ways.go => virtualnetworkgatewaysgroup.go} |  142 +-
 ...ings.go => virtualnetworkpeeringsgroup.go} |   78 +-
 ...ualnetworks.go => virtualnetworksgroup.go} |  140 +-
 .../network/{watchers.go => watchersgroup.go} |  212 +-
 ...ateways.go => applicationgatewaysgroup.go} |  206 +-
 ...s.go => availableendpointservicesgroup.go} |   41 +-
 ...ities.go => bgpservicecommunitiesgroup.go} |   40 +-
 .../network/mgmt/2017-06-01/network/client.go |   72 -
 ...yrules.go => defaultsecurityrulesgroup.go} |   54 +-
 ...expressroutecircuitauthorizationsgroup.go} |   82 +-
 ...go => expressroutecircuitpeeringsgroup.go} |   79 +-
 ...rcuits.go => expressroutecircuitsgroup.go} |  166 +-
 ...o => expressrouteserviceprovidersgroup.go} |   43 +-
 .../network/mgmt/2017-06-01/network/group.go  |  109 +
 ...undnatrules.go => inboundnatrulesgroup.go} |   80 +-
 ...s.go => interfaceipconfigurationsgroup.go} |   55 +-
 ...cers.go => interfaceloadbalancersgroup.go} |   40 +-
 .../{interfaces.go => interfacesgroup.go}     |  188 +-
 ...> loadbalancerbackendaddresspoolsgroup.go} |   57 +-
 ...dbalancerfrontendipconfigurationsgroup.go} |   58 +-
 ...=> loadbalancerloadbalancingrulesgroup.go} |   57 +-
 ... => loadbalancernetworkinterfacesgroup.go} |   43 +-
 ...erprobes.go => loadbalancerprobesgroup.go} |   54 +-
 ...loadbalancers.go => loadbalancersgroup.go} |  102 +-
 ...teways.go => localnetworkgatewaysgroup.go} |   84 +-
 .../network/mgmt/2017-06-01/network/models.go | 1730 +++++++-----
 ...cketcaptures.go => packetcapturesgroup.go} |   94 +-
 ...addresses.go => publicipaddressesgroup.go} |  166 +-
 ...ilterrules.go => routefilterrulesgroup.go} |   92 +-
 .../{routefilters.go => routefiltersgroup.go} |  114 +-
 .../network/{routes.go => routesgroup.go}     |   78 +-
 .../{routetables.go => routetablesgroup.go}   |  102 +-
 ...curitygroups.go => securitygroupsgroup.go} |  102 +-
 ...securityrules.go => securityrulesgroup.go} |   78 +-
 .../network/{subnets.go => subnetsgroup.go}   |   78 +-
 .../network/{usages.go => usagesgroup.go}     |   42 +-
 .../mgmt/2017-06-01/network/version.go        |    6 +-
 ... virtualnetworkgatewayconnectionsgroup.go} |  125 +-
 ...ways.go => virtualnetworkgatewaysgroup.go} |  176 +-
 ...ings.go => virtualnetworkpeeringsgroup.go} |   78 +-
 ...ualnetworks.go => virtualnetworksgroup.go} |  140 +-
 .../network/{watchers.go => watchersgroup.go} |  212 +-
 ...ateways.go => applicationgatewaysgroup.go} |  206 +-
 ...s.go => availableendpointservicesgroup.go} |   41 +-
 ...ities.go => bgpservicecommunitiesgroup.go} |   40 +-
 .../network/mgmt/2017-08-01/network/client.go |   70 -
 ...yrules.go => defaultsecurityrulesgroup.go} |   54 +-
 ...expressroutecircuitauthorizationsgroup.go} |   82 +-
 ...go => expressroutecircuitpeeringsgroup.go} |   79 +-
 ...rcuits.go => expressroutecircuitsgroup.go} |  166 +-
 ...o => expressrouteserviceprovidersgroup.go} |   43 +-
 .../network/mgmt/2017-08-01/network/group.go  |  107 +
 ...undnatrules.go => inboundnatrulesgroup.go} |   80 +-
 ...s.go => interfaceipconfigurationsgroup.go} |   55 +-
 ...cers.go => interfaceloadbalancersgroup.go} |   40 +-
 .../{interfaces.go => interfacesgroup.go}     |  188 +-
 ...> loadbalancerbackendaddresspoolsgroup.go} |   57 +-
 ...dbalancerfrontendipconfigurationsgroup.go} |   58 +-
 ...=> loadbalancerloadbalancingrulesgroup.go} |   57 +-
 ... => loadbalancernetworkinterfacesgroup.go} |   43 +-
 ...erprobes.go => loadbalancerprobesgroup.go} |   54 +-
 ...loadbalancers.go => loadbalancersgroup.go} |  102 +-
 ...teways.go => localnetworkgatewaysgroup.go} |   84 +-
 .../network/mgmt/2017-08-01/network/models.go | 1758 ++++++++-----
 ...cketcaptures.go => packetcapturesgroup.go} |   94 +-
 ...addresses.go => publicipaddressesgroup.go} |  166 +-
 ...ilterrules.go => routefilterrulesgroup.go} |   92 +-
 .../{routefilters.go => routefiltersgroup.go} |  114 +-
 .../network/{routes.go => routesgroup.go}     |   78 +-
 .../{routetables.go => routetablesgroup.go}   |  102 +-
 ...curitygroups.go => securitygroupsgroup.go} |  102 +-
 ...securityrules.go => securityrulesgroup.go} |   78 +-
 .../network/{subnets.go => subnetsgroup.go}   |   78 +-
 .../network/{usages.go => usagesgroup.go}     |   42 +-
 .../mgmt/2017-08-01/network/version.go        |    6 +-
 ... virtualnetworkgatewayconnectionsgroup.go} |  125 +-
 ...ways.go => virtualnetworkgatewaysgroup.go} |  188 +-
 ...ings.go => virtualnetworkpeeringsgroup.go} |   78 +-
 ...ualnetworks.go => virtualnetworksgroup.go} |  140 +-
 .../network/{watchers.go => watchersgroup.go} |  212 +-
 ...ateways.go => applicationgatewaysgroup.go} |  218 +-
 ...s.go => applicationsecuritygroupsgroup.go} |  103 +-
 ...s.go => availableendpointservicesgroup.go} |   41 +-
 ...ities.go => bgpservicecommunitiesgroup.go} |   40 +-
 .../network/mgmt/2017-09-01/network/client.go |   70 -
 ...yrules.go => defaultsecurityrulesgroup.go} |   54 +-
 ...expressroutecircuitauthorizationsgroup.go} |   82 +-
 ...go => expressroutecircuitpeeringsgroup.go} |   79 +-
 ...rcuits.go => expressroutecircuitsgroup.go} |  178 +-
 ...o => expressrouteserviceprovidersgroup.go} |   43 +-
 .../network/mgmt/2017-09-01/network/group.go  |  107 +
 ...undnatrules.go => inboundnatrulesgroup.go} |   80 +-
 ...s.go => interfaceipconfigurationsgroup.go} |   55 +-
 ...cers.go => interfaceloadbalancersgroup.go} |   40 +-
 .../{interfaces.go => interfacesgroup.go}     |  238 +-
 ...> loadbalancerbackendaddresspoolsgroup.go} |   57 +-
 ...dbalancerfrontendipconfigurationsgroup.go} |   58 +-
 ...=> loadbalancerloadbalancingrulesgroup.go} |   57 +-
 ... => loadbalancernetworkinterfacesgroup.go} |   43 +-
 ...erprobes.go => loadbalancerprobesgroup.go} |   54 +-
 ...loadbalancers.go => loadbalancersgroup.go} |  114 +-
 ...teways.go => localnetworkgatewaysgroup.go} |   98 +-
 .../network/mgmt/2017-09-01/network/models.go | 2199 +++++++++-------
 .../{operations.go => operationsgroup.go}     |   40 +-
 ...cketcaptures.go => packetcapturesgroup.go} |   94 +-
 ...addresses.go => publicipaddressesgroup.go} |  178 +-
 ...ilterrules.go => routefilterrulesgroup.go} |   92 +-
 .../{routefilters.go => routefiltersgroup.go} |  114 +-
 .../network/{routes.go => routesgroup.go}     |   78 +-
 .../{routetables.go => routetablesgroup.go}   |  114 +-
 ...curitygroups.go => securitygroupsgroup.go} |  114 +-
 ...securityrules.go => securityrulesgroup.go} |   78 +-
 .../network/{subnets.go => subnetsgroup.go}   |   78 +-
 .../network/{usages.go => usagesgroup.go}     |   42 +-
 .../mgmt/2017-09-01/network/version.go        |    6 +-
 ... virtualnetworkgatewayconnectionsgroup.go} |  137 +-
 ...ways.go => virtualnetworkgatewaysgroup.go} |  228 +-
 ...ings.go => virtualnetworkpeeringsgroup.go} |   78 +-
 ...ualnetworks.go => virtualnetworksgroup.go} |  152 +-
 .../network/{watchers.go => watchersgroup.go} |  252 +-
 ...ateways.go => applicationgatewaysgroup.go} |  218 +-
 ...s.go => applicationsecuritygroupsgroup.go} |  103 +-
 ...s.go => availableendpointservicesgroup.go} |   41 +-
 ...ities.go => bgpservicecommunitiesgroup.go} |   40 +-
 .../network/mgmt/2017-10-01/network/client.go |   70 -
 ...monitors.go => connectionmonitorsgroup.go} |  106 +-
 ...yrules.go => defaultsecurityrulesgroup.go} |   54 +-
 ...expressroutecircuitauthorizationsgroup.go} |   82 +-
 ...go => expressroutecircuitpeeringsgroup.go} |   81 +-
 ...rcuits.go => expressroutecircuitsgroup.go} |  178 +-
 ...o => expressrouteserviceprovidersgroup.go} |   43 +-
 .../network/mgmt/2017-10-01/network/group.go  |  107 +
 ...undnatrules.go => inboundnatrulesgroup.go} |   80 +-
 ...s.go => interfaceipconfigurationsgroup.go} |   55 +-
 ...cers.go => interfaceloadbalancersgroup.go} |   40 +-
 .../{interfaces.go => interfacesgroup.go}     |  238 +-
 ...> loadbalancerbackendaddresspoolsgroup.go} |   57 +-
 ...dbalancerfrontendipconfigurationsgroup.go} |   58 +-
 ...=> loadbalancerloadbalancingrulesgroup.go} |   57 +-
 ... => loadbalancernetworkinterfacesgroup.go} |   43 +-
 ...erprobes.go => loadbalancerprobesgroup.go} |   54 +-
 ...loadbalancers.go => loadbalancersgroup.go} |  114 +-
 ...teways.go => localnetworkgatewaysgroup.go} |   98 +-
 .../network/mgmt/2017-10-01/network/models.go | 2329 ++++++++++-------
 .../{operations.go => operationsgroup.go}     |   40 +-
 ...cketcaptures.go => packetcapturesgroup.go} |   94 +-
 ...addresses.go => publicipaddressesgroup.go} |  178 +-
 ...ilterrules.go => routefilterrulesgroup.go} |   92 +-
 .../{routefilters.go => routefiltersgroup.go} |  114 +-
 .../network/{routes.go => routesgroup.go}     |   78 +-
 .../{routetables.go => routetablesgroup.go}   |  114 +-
 ...curitygroups.go => securitygroupsgroup.go} |  114 +-
 ...securityrules.go => securityrulesgroup.go} |   78 +-
 .../network/{subnets.go => subnetsgroup.go}   |   78 +-
 .../network/{usages.go => usagesgroup.go}     |   42 +-
 .../mgmt/2017-10-01/network/version.go        |    6 +-
 ... virtualnetworkgatewayconnectionsgroup.go} |  137 +-
 ...ways.go => virtualnetworkgatewaysgroup.go} |  228 +-
 ...ings.go => virtualnetworkpeeringsgroup.go} |   78 +-
 ...ualnetworks.go => virtualnetworksgroup.go} |  152 +-
 .../network/{watchers.go => watchersgroup.go} |  250 +-
 ...ateways.go => applicationgatewaysgroup.go} |  218 +-
 ...s.go => applicationsecuritygroupsgroup.go} |  103 +-
 ...s.go => availableendpointservicesgroup.go} |   41 +-
 ...ities.go => bgpservicecommunitiesgroup.go} |   40 +-
 .../network/mgmt/2017-11-01/network/client.go |   70 -
 ...monitors.go => connectionmonitorsgroup.go} |  106 +-
 ...yrules.go => defaultsecurityrulesgroup.go} |   54 +-
 ...expressroutecircuitauthorizationsgroup.go} |   82 +-
 ...go => expressroutecircuitpeeringsgroup.go} |   81 +-
 ...rcuits.go => expressroutecircuitsgroup.go} |  178 +-
 ...o => expressrouteserviceprovidersgroup.go} |   43 +-
 .../network/mgmt/2017-11-01/network/group.go  |  107 +
 ...undnatrules.go => inboundnatrulesgroup.go} |   80 +-
 ...s.go => interfaceipconfigurationsgroup.go} |   55 +-
 ...cers.go => interfaceloadbalancersgroup.go} |   40 +-
 .../{interfaces.go => interfacesgroup.go}     |  238 +-
 ...> loadbalancerbackendaddresspoolsgroup.go} |   57 +-
 ...dbalancerfrontendipconfigurationsgroup.go} |   58 +-
 ...=> loadbalancerloadbalancingrulesgroup.go} |   57 +-
 ... => loadbalancernetworkinterfacesgroup.go} |   43 +-
 ...erprobes.go => loadbalancerprobesgroup.go} |   54 +-
 ...loadbalancers.go => loadbalancersgroup.go} |  114 +-
 ...teways.go => localnetworkgatewaysgroup.go} |   98 +-
 .../network/mgmt/2017-11-01/network/models.go | 2329 ++++++++++-------
 .../{operations.go => operationsgroup.go}     |   40 +-
 ...cketcaptures.go => packetcapturesgroup.go} |   94 +-
 ...addresses.go => publicipaddressesgroup.go} |  178 +-
 ...ilterrules.go => routefilterrulesgroup.go} |   92 +-
 .../{routefilters.go => routefiltersgroup.go} |  114 +-
 .../network/{routes.go => routesgroup.go}     |   78 +-
 .../{routetables.go => routetablesgroup.go}   |  114 +-
 ...curitygroups.go => securitygroupsgroup.go} |  114 +-
 ...securityrules.go => securityrulesgroup.go} |   78 +-
 .../network/{subnets.go => subnetsgroup.go}   |   78 +-
 .../network/{usages.go => usagesgroup.go}     |   42 +-
 .../mgmt/2017-11-01/network/version.go        |    6 +-
 ... virtualnetworkgatewayconnectionsgroup.go} |  137 +-
 ...ways.go => virtualnetworkgatewaysgroup.go} |  228 +-
 ...ings.go => virtualnetworkpeeringsgroup.go} |   78 +-
 ...ualnetworks.go => virtualnetworksgroup.go} |  152 +-
 .../network/{watchers.go => watchersgroup.go} |  250 +-
 .../network/mgmt/2018-01-01/network/models.go |  388 ++-
 .../mgmt/2018-01-01/network/version.go        |    6 +-
 240 files changed, 19127 insertions(+), 15456 deletions(-)
 rename services/network/mgmt/2017-03-01/network/{applicationgateways.go => applicationgatewaysgroup.go} (71%)
 rename services/network/mgmt/2017-03-01/network/{bgpservicecommunities.go => bgpservicecommunitiesgroup.go} (63%)
 rename services/network/mgmt/2017-03-01/network/{expressroutecircuitauthorizations.go => expressroutecircuitauthorizationsgroup.go} (67%)
 rename services/network/mgmt/2017-03-01/network/{expressroutecircuitpeerings.go => expressroutecircuitpeeringsgroup.go} (68%)
 rename services/network/mgmt/2017-03-01/network/{expressroutecircuits.go => expressroutecircuitsgroup.go} (71%)
 rename services/network/mgmt/2017-03-01/network/{expressrouteserviceproviders.go => expressrouteserviceprovidersgroup.go} (61%)
 create mode 100644 services/network/mgmt/2017-03-01/network/group.go
 rename services/network/mgmt/2017-03-01/network/{interfaces.go => interfacesgroup.go} (66%)
 rename services/network/mgmt/2017-03-01/network/{loadbalancers.go => loadbalancersgroup.go} (65%)
 rename services/network/mgmt/2017-03-01/network/{localnetworkgateways.go => localnetworkgatewaysgroup.go} (71%)
 rename services/network/mgmt/2017-03-01/network/{packetcaptures.go => packetcapturesgroup.go} (71%)
 rename services/network/mgmt/2017-03-01/network/{publicipaddresses.go => publicipaddressesgroup.go} (70%)
 rename services/network/mgmt/2017-03-01/network/{routefilterrules.go => routefilterrulesgroup.go} (72%)
 rename services/network/mgmt/2017-03-01/network/{routefilters.go => routefiltersgroup.go} (66%)
 rename services/network/mgmt/2017-03-01/network/{routes.go => routesgroup.go} (69%)
 rename services/network/mgmt/2017-03-01/network/{routetables.go => routetablesgroup.go} (65%)
 rename services/network/mgmt/2017-03-01/network/{securitygroups.go => securitygroupsgroup.go} (65%)
 rename services/network/mgmt/2017-03-01/network/{securityrules.go => securityrulesgroup.go} (68%)
 rename services/network/mgmt/2017-03-01/network/{subnets.go => subnetsgroup.go} (69%)
 rename services/network/mgmt/2017-03-01/network/{usages.go => usagesgroup.go} (64%)
 rename services/network/mgmt/2017-03-01/network/{virtualnetworkgatewayconnections.go => virtualnetworkgatewayconnectionsgroup.go} (71%)
 rename services/network/mgmt/2017-03-01/network/{virtualnetworkgateways.go => virtualnetworkgatewaysgroup.go} (73%)
 rename services/network/mgmt/2017-03-01/network/{virtualnetworkpeerings.go => virtualnetworkpeeringsgroup.go} (70%)
 rename services/network/mgmt/2017-03-01/network/{virtualnetworks.go => virtualnetworksgroup.go} (70%)
 rename services/network/mgmt/2017-03-01/network/{watchers.go => watchersgroup.go} (71%)
 rename services/network/mgmt/2017-06-01/network/{applicationgateways.go => applicationgatewaysgroup.go} (70%)
 rename services/network/mgmt/2017-06-01/network/{availableendpointservices.go => availableendpointservicesgroup.go} (62%)
 rename services/network/mgmt/2017-06-01/network/{bgpservicecommunities.go => bgpservicecommunitiesgroup.go} (63%)
 rename services/network/mgmt/2017-06-01/network/{defaultsecurityrules.go => defaultsecurityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-06-01/network/{expressroutecircuitauthorizations.go => expressroutecircuitauthorizationsgroup.go} (67%)
 rename services/network/mgmt/2017-06-01/network/{expressroutecircuitpeerings.go => expressroutecircuitpeeringsgroup.go} (68%)
 rename services/network/mgmt/2017-06-01/network/{expressroutecircuits.go => expressroutecircuitsgroup.go} (71%)
 rename services/network/mgmt/2017-06-01/network/{expressrouteserviceproviders.go => expressrouteserviceprovidersgroup.go} (61%)
 create mode 100644 services/network/mgmt/2017-06-01/network/group.go
 rename services/network/mgmt/2017-06-01/network/{inboundnatrules.go => inboundnatrulesgroup.go} (74%)
 rename services/network/mgmt/2017-06-01/network/{interfaceipconfigurations.go => interfaceipconfigurationsgroup.go} (66%)
 rename services/network/mgmt/2017-06-01/network/{interfaceloadbalancers.go => interfaceloadbalancersgroup.go} (63%)
 rename services/network/mgmt/2017-06-01/network/{interfaces.go => interfacesgroup.go} (66%)
 rename services/network/mgmt/2017-06-01/network/{loadbalancerbackendaddresspools.go => loadbalancerbackendaddresspoolsgroup.go} (64%)
 rename services/network/mgmt/2017-06-01/network/{loadbalancerfrontendipconfigurations.go => loadbalancerfrontendipconfigurationsgroup.go} (63%)
 rename services/network/mgmt/2017-06-01/network/{loadbalancerloadbalancingrules.go => loadbalancerloadbalancingrulesgroup.go} (65%)
 rename services/network/mgmt/2017-06-01/network/{loadbalancernetworkinterfaces.go => loadbalancernetworkinterfacesgroup.go} (62%)
 rename services/network/mgmt/2017-06-01/network/{loadbalancerprobes.go => loadbalancerprobesgroup.go} (67%)
 rename services/network/mgmt/2017-06-01/network/{loadbalancers.go => loadbalancersgroup.go} (65%)
 rename services/network/mgmt/2017-06-01/network/{localnetworkgateways.go => localnetworkgatewaysgroup.go} (71%)
 rename services/network/mgmt/2017-06-01/network/{packetcaptures.go => packetcapturesgroup.go} (71%)
 rename services/network/mgmt/2017-06-01/network/{publicipaddresses.go => publicipaddressesgroup.go} (70%)
 rename services/network/mgmt/2017-06-01/network/{routefilterrules.go => routefilterrulesgroup.go} (72%)
 rename services/network/mgmt/2017-06-01/network/{routefilters.go => routefiltersgroup.go} (66%)
 rename services/network/mgmt/2017-06-01/network/{routes.go => routesgroup.go} (69%)
 rename services/network/mgmt/2017-06-01/network/{routetables.go => routetablesgroup.go} (65%)
 rename services/network/mgmt/2017-06-01/network/{securitygroups.go => securitygroupsgroup.go} (65%)
 rename services/network/mgmt/2017-06-01/network/{securityrules.go => securityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-06-01/network/{subnets.go => subnetsgroup.go} (69%)
 rename services/network/mgmt/2017-06-01/network/{usages.go => usagesgroup.go} (64%)
 rename services/network/mgmt/2017-06-01/network/{virtualnetworkgatewayconnections.go => virtualnetworkgatewayconnectionsgroup.go} (71%)
 rename services/network/mgmt/2017-06-01/network/{virtualnetworkgateways.go => virtualnetworkgatewaysgroup.go} (72%)
 rename services/network/mgmt/2017-06-01/network/{virtualnetworkpeerings.go => virtualnetworkpeeringsgroup.go} (70%)
 rename services/network/mgmt/2017-06-01/network/{virtualnetworks.go => virtualnetworksgroup.go} (70%)
 rename services/network/mgmt/2017-06-01/network/{watchers.go => watchersgroup.go} (71%)
 rename services/network/mgmt/2017-08-01/network/{applicationgateways.go => applicationgatewaysgroup.go} (70%)
 rename services/network/mgmt/2017-08-01/network/{availableendpointservices.go => availableendpointservicesgroup.go} (62%)
 rename services/network/mgmt/2017-08-01/network/{bgpservicecommunities.go => bgpservicecommunitiesgroup.go} (63%)
 rename services/network/mgmt/2017-08-01/network/{defaultsecurityrules.go => defaultsecurityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-08-01/network/{expressroutecircuitauthorizations.go => expressroutecircuitauthorizationsgroup.go} (67%)
 rename services/network/mgmt/2017-08-01/network/{expressroutecircuitpeerings.go => expressroutecircuitpeeringsgroup.go} (68%)
 rename services/network/mgmt/2017-08-01/network/{expressroutecircuits.go => expressroutecircuitsgroup.go} (71%)
 rename services/network/mgmt/2017-08-01/network/{expressrouteserviceproviders.go => expressrouteserviceprovidersgroup.go} (61%)
 create mode 100644 services/network/mgmt/2017-08-01/network/group.go
 rename services/network/mgmt/2017-08-01/network/{inboundnatrules.go => inboundnatrulesgroup.go} (74%)
 rename services/network/mgmt/2017-08-01/network/{interfaceipconfigurations.go => interfaceipconfigurationsgroup.go} (66%)
 rename services/network/mgmt/2017-08-01/network/{interfaceloadbalancers.go => interfaceloadbalancersgroup.go} (63%)
 rename services/network/mgmt/2017-08-01/network/{interfaces.go => interfacesgroup.go} (66%)
 rename services/network/mgmt/2017-08-01/network/{loadbalancerbackendaddresspools.go => loadbalancerbackendaddresspoolsgroup.go} (64%)
 rename services/network/mgmt/2017-08-01/network/{loadbalancerfrontendipconfigurations.go => loadbalancerfrontendipconfigurationsgroup.go} (63%)
 rename services/network/mgmt/2017-08-01/network/{loadbalancerloadbalancingrules.go => loadbalancerloadbalancingrulesgroup.go} (65%)
 rename services/network/mgmt/2017-08-01/network/{loadbalancernetworkinterfaces.go => loadbalancernetworkinterfacesgroup.go} (62%)
 rename services/network/mgmt/2017-08-01/network/{loadbalancerprobes.go => loadbalancerprobesgroup.go} (67%)
 rename services/network/mgmt/2017-08-01/network/{loadbalancers.go => loadbalancersgroup.go} (65%)
 rename services/network/mgmt/2017-08-01/network/{localnetworkgateways.go => localnetworkgatewaysgroup.go} (71%)
 rename services/network/mgmt/2017-08-01/network/{packetcaptures.go => packetcapturesgroup.go} (71%)
 rename services/network/mgmt/2017-08-01/network/{publicipaddresses.go => publicipaddressesgroup.go} (70%)
 rename services/network/mgmt/2017-08-01/network/{routefilterrules.go => routefilterrulesgroup.go} (72%)
 rename services/network/mgmt/2017-08-01/network/{routefilters.go => routefiltersgroup.go} (66%)
 rename services/network/mgmt/2017-08-01/network/{routes.go => routesgroup.go} (69%)
 rename services/network/mgmt/2017-08-01/network/{routetables.go => routetablesgroup.go} (65%)
 rename services/network/mgmt/2017-08-01/network/{securitygroups.go => securitygroupsgroup.go} (65%)
 rename services/network/mgmt/2017-08-01/network/{securityrules.go => securityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-08-01/network/{subnets.go => subnetsgroup.go} (69%)
 rename services/network/mgmt/2017-08-01/network/{usages.go => usagesgroup.go} (64%)
 rename services/network/mgmt/2017-08-01/network/{virtualnetworkgatewayconnections.go => virtualnetworkgatewayconnectionsgroup.go} (71%)
 rename services/network/mgmt/2017-08-01/network/{virtualnetworkgateways.go => virtualnetworkgatewaysgroup.go} (72%)
 rename services/network/mgmt/2017-08-01/network/{virtualnetworkpeerings.go => virtualnetworkpeeringsgroup.go} (70%)
 rename services/network/mgmt/2017-08-01/network/{virtualnetworks.go => virtualnetworksgroup.go} (70%)
 rename services/network/mgmt/2017-08-01/network/{watchers.go => watchersgroup.go} (71%)
 rename services/network/mgmt/2017-09-01/network/{applicationgateways.go => applicationgatewaysgroup.go} (71%)
 rename services/network/mgmt/2017-09-01/network/{applicationsecuritygroups.go => applicationsecuritygroupsgroup.go} (68%)
 rename services/network/mgmt/2017-09-01/network/{availableendpointservices.go => availableendpointservicesgroup.go} (62%)
 rename services/network/mgmt/2017-09-01/network/{bgpservicecommunities.go => bgpservicecommunitiesgroup.go} (63%)
 rename services/network/mgmt/2017-09-01/network/{defaultsecurityrules.go => defaultsecurityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-09-01/network/{expressroutecircuitauthorizations.go => expressroutecircuitauthorizationsgroup.go} (67%)
 rename services/network/mgmt/2017-09-01/network/{expressroutecircuitpeerings.go => expressroutecircuitpeeringsgroup.go} (68%)
 rename services/network/mgmt/2017-09-01/network/{expressroutecircuits.go => expressroutecircuitsgroup.go} (72%)
 rename services/network/mgmt/2017-09-01/network/{expressrouteserviceproviders.go => expressrouteserviceprovidersgroup.go} (61%)
 create mode 100644 services/network/mgmt/2017-09-01/network/group.go
 rename services/network/mgmt/2017-09-01/network/{inboundnatrules.go => inboundnatrulesgroup.go} (74%)
 rename services/network/mgmt/2017-09-01/network/{interfaceipconfigurations.go => interfaceipconfigurationsgroup.go} (66%)
 rename services/network/mgmt/2017-09-01/network/{interfaceloadbalancers.go => interfaceloadbalancersgroup.go} (63%)
 rename services/network/mgmt/2017-09-01/network/{interfaces.go => interfacesgroup.go} (66%)
 rename services/network/mgmt/2017-09-01/network/{loadbalancerbackendaddresspools.go => loadbalancerbackendaddresspoolsgroup.go} (64%)
 rename services/network/mgmt/2017-09-01/network/{loadbalancerfrontendipconfigurations.go => loadbalancerfrontendipconfigurationsgroup.go} (63%)
 rename services/network/mgmt/2017-09-01/network/{loadbalancerloadbalancingrules.go => loadbalancerloadbalancingrulesgroup.go} (65%)
 rename services/network/mgmt/2017-09-01/network/{loadbalancernetworkinterfaces.go => loadbalancernetworkinterfacesgroup.go} (62%)
 rename services/network/mgmt/2017-09-01/network/{loadbalancerprobes.go => loadbalancerprobesgroup.go} (67%)
 rename services/network/mgmt/2017-09-01/network/{loadbalancers.go => loadbalancersgroup.go} (66%)
 rename services/network/mgmt/2017-09-01/network/{localnetworkgateways.go => localnetworkgatewaysgroup.go} (72%)
 rename services/network/mgmt/2017-09-01/network/{operations.go => operationsgroup.go} (60%)
 rename services/network/mgmt/2017-09-01/network/{packetcaptures.go => packetcapturesgroup.go} (71%)
 rename services/network/mgmt/2017-09-01/network/{publicipaddresses.go => publicipaddressesgroup.go} (70%)
 rename services/network/mgmt/2017-09-01/network/{routefilterrules.go => routefilterrulesgroup.go} (72%)
 rename services/network/mgmt/2017-09-01/network/{routefilters.go => routefiltersgroup.go} (66%)
 rename services/network/mgmt/2017-09-01/network/{routes.go => routesgroup.go} (69%)
 rename services/network/mgmt/2017-09-01/network/{routetables.go => routetablesgroup.go} (66%)
 rename services/network/mgmt/2017-09-01/network/{securitygroups.go => securitygroupsgroup.go} (66%)
 rename services/network/mgmt/2017-09-01/network/{securityrules.go => securityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-09-01/network/{subnets.go => subnetsgroup.go} (69%)
 rename services/network/mgmt/2017-09-01/network/{usages.go => usagesgroup.go} (64%)
 rename services/network/mgmt/2017-09-01/network/{virtualnetworkgatewayconnections.go => virtualnetworkgatewayconnectionsgroup.go} (71%)
 rename services/network/mgmt/2017-09-01/network/{virtualnetworkgateways.go => virtualnetworkgatewaysgroup.go} (73%)
 rename services/network/mgmt/2017-09-01/network/{virtualnetworkpeerings.go => virtualnetworkpeeringsgroup.go} (70%)
 rename services/network/mgmt/2017-09-01/network/{virtualnetworks.go => virtualnetworksgroup.go} (71%)
 rename services/network/mgmt/2017-09-01/network/{watchers.go => watchersgroup.go} (71%)
 rename services/network/mgmt/2017-10-01/network/{applicationgateways.go => applicationgatewaysgroup.go} (71%)
 rename services/network/mgmt/2017-10-01/network/{applicationsecuritygroups.go => applicationsecuritygroupsgroup.go} (68%)
 rename services/network/mgmt/2017-10-01/network/{availableendpointservices.go => availableendpointservicesgroup.go} (62%)
 rename services/network/mgmt/2017-10-01/network/{bgpservicecommunities.go => bgpservicecommunitiesgroup.go} (63%)
 rename services/network/mgmt/2017-10-01/network/{connectionmonitors.go => connectionmonitorsgroup.go} (74%)
 rename services/network/mgmt/2017-10-01/network/{defaultsecurityrules.go => defaultsecurityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-10-01/network/{expressroutecircuitauthorizations.go => expressroutecircuitauthorizationsgroup.go} (67%)
 rename services/network/mgmt/2017-10-01/network/{expressroutecircuitpeerings.go => expressroutecircuitpeeringsgroup.go} (70%)
 rename services/network/mgmt/2017-10-01/network/{expressroutecircuits.go => expressroutecircuitsgroup.go} (72%)
 rename services/network/mgmt/2017-10-01/network/{expressrouteserviceproviders.go => expressrouteserviceprovidersgroup.go} (61%)
 create mode 100644 services/network/mgmt/2017-10-01/network/group.go
 rename services/network/mgmt/2017-10-01/network/{inboundnatrules.go => inboundnatrulesgroup.go} (74%)
 rename services/network/mgmt/2017-10-01/network/{interfaceipconfigurations.go => interfaceipconfigurationsgroup.go} (66%)
 rename services/network/mgmt/2017-10-01/network/{interfaceloadbalancers.go => interfaceloadbalancersgroup.go} (63%)
 rename services/network/mgmt/2017-10-01/network/{interfaces.go => interfacesgroup.go} (66%)
 rename services/network/mgmt/2017-10-01/network/{loadbalancerbackendaddresspools.go => loadbalancerbackendaddresspoolsgroup.go} (64%)
 rename services/network/mgmt/2017-10-01/network/{loadbalancerfrontendipconfigurations.go => loadbalancerfrontendipconfigurationsgroup.go} (63%)
 rename services/network/mgmt/2017-10-01/network/{loadbalancerloadbalancingrules.go => loadbalancerloadbalancingrulesgroup.go} (65%)
 rename services/network/mgmt/2017-10-01/network/{loadbalancernetworkinterfaces.go => loadbalancernetworkinterfacesgroup.go} (62%)
 rename services/network/mgmt/2017-10-01/network/{loadbalancerprobes.go => loadbalancerprobesgroup.go} (67%)
 rename services/network/mgmt/2017-10-01/network/{loadbalancers.go => loadbalancersgroup.go} (66%)
 rename services/network/mgmt/2017-10-01/network/{localnetworkgateways.go => localnetworkgatewaysgroup.go} (72%)
 rename services/network/mgmt/2017-10-01/network/{operations.go => operationsgroup.go} (60%)
 rename services/network/mgmt/2017-10-01/network/{packetcaptures.go => packetcapturesgroup.go} (71%)
 rename services/network/mgmt/2017-10-01/network/{publicipaddresses.go => publicipaddressesgroup.go} (70%)
 rename services/network/mgmt/2017-10-01/network/{routefilterrules.go => routefilterrulesgroup.go} (72%)
 rename services/network/mgmt/2017-10-01/network/{routefilters.go => routefiltersgroup.go} (66%)
 rename services/network/mgmt/2017-10-01/network/{routes.go => routesgroup.go} (69%)
 rename services/network/mgmt/2017-10-01/network/{routetables.go => routetablesgroup.go} (66%)
 rename services/network/mgmt/2017-10-01/network/{securitygroups.go => securitygroupsgroup.go} (66%)
 rename services/network/mgmt/2017-10-01/network/{securityrules.go => securityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-10-01/network/{subnets.go => subnetsgroup.go} (69%)
 rename services/network/mgmt/2017-10-01/network/{usages.go => usagesgroup.go} (64%)
 rename services/network/mgmt/2017-10-01/network/{virtualnetworkgatewayconnections.go => virtualnetworkgatewayconnectionsgroup.go} (71%)
 rename services/network/mgmt/2017-10-01/network/{virtualnetworkgateways.go => virtualnetworkgatewaysgroup.go} (73%)
 rename services/network/mgmt/2017-10-01/network/{virtualnetworkpeerings.go => virtualnetworkpeeringsgroup.go} (70%)
 rename services/network/mgmt/2017-10-01/network/{virtualnetworks.go => virtualnetworksgroup.go} (71%)
 rename services/network/mgmt/2017-10-01/network/{watchers.go => watchersgroup.go} (71%)
 rename services/network/mgmt/2017-11-01/network/{applicationgateways.go => applicationgatewaysgroup.go} (71%)
 rename services/network/mgmt/2017-11-01/network/{applicationsecuritygroups.go => applicationsecuritygroupsgroup.go} (68%)
 rename services/network/mgmt/2017-11-01/network/{availableendpointservices.go => availableendpointservicesgroup.go} (62%)
 rename services/network/mgmt/2017-11-01/network/{bgpservicecommunities.go => bgpservicecommunitiesgroup.go} (63%)
 rename services/network/mgmt/2017-11-01/network/{connectionmonitors.go => connectionmonitorsgroup.go} (74%)
 rename services/network/mgmt/2017-11-01/network/{defaultsecurityrules.go => defaultsecurityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-11-01/network/{expressroutecircuitauthorizations.go => expressroutecircuitauthorizationsgroup.go} (67%)
 rename services/network/mgmt/2017-11-01/network/{expressroutecircuitpeerings.go => expressroutecircuitpeeringsgroup.go} (70%)
 rename services/network/mgmt/2017-11-01/network/{expressroutecircuits.go => expressroutecircuitsgroup.go} (72%)
 rename services/network/mgmt/2017-11-01/network/{expressrouteserviceproviders.go => expressrouteserviceprovidersgroup.go} (61%)
 create mode 100644 services/network/mgmt/2017-11-01/network/group.go
 rename services/network/mgmt/2017-11-01/network/{inboundnatrules.go => inboundnatrulesgroup.go} (74%)
 rename services/network/mgmt/2017-11-01/network/{interfaceipconfigurations.go => interfaceipconfigurationsgroup.go} (66%)
 rename services/network/mgmt/2017-11-01/network/{interfaceloadbalancers.go => interfaceloadbalancersgroup.go} (63%)
 rename services/network/mgmt/2017-11-01/network/{interfaces.go => interfacesgroup.go} (66%)
 rename services/network/mgmt/2017-11-01/network/{loadbalancerbackendaddresspools.go => loadbalancerbackendaddresspoolsgroup.go} (64%)
 rename services/network/mgmt/2017-11-01/network/{loadbalancerfrontendipconfigurations.go => loadbalancerfrontendipconfigurationsgroup.go} (63%)
 rename services/network/mgmt/2017-11-01/network/{loadbalancerloadbalancingrules.go => loadbalancerloadbalancingrulesgroup.go} (65%)
 rename services/network/mgmt/2017-11-01/network/{loadbalancernetworkinterfaces.go => loadbalancernetworkinterfacesgroup.go} (62%)
 rename services/network/mgmt/2017-11-01/network/{loadbalancerprobes.go => loadbalancerprobesgroup.go} (67%)
 rename services/network/mgmt/2017-11-01/network/{loadbalancers.go => loadbalancersgroup.go} (66%)
 rename services/network/mgmt/2017-11-01/network/{localnetworkgateways.go => localnetworkgatewaysgroup.go} (72%)
 rename services/network/mgmt/2017-11-01/network/{operations.go => operationsgroup.go} (60%)
 rename services/network/mgmt/2017-11-01/network/{packetcaptures.go => packetcapturesgroup.go} (71%)
 rename services/network/mgmt/2017-11-01/network/{publicipaddresses.go => publicipaddressesgroup.go} (70%)
 rename services/network/mgmt/2017-11-01/network/{routefilterrules.go => routefilterrulesgroup.go} (72%)
 rename services/network/mgmt/2017-11-01/network/{routefilters.go => routefiltersgroup.go} (66%)
 rename services/network/mgmt/2017-11-01/network/{routes.go => routesgroup.go} (69%)
 rename services/network/mgmt/2017-11-01/network/{routetables.go => routetablesgroup.go} (66%)
 rename services/network/mgmt/2017-11-01/network/{securitygroups.go => securitygroupsgroup.go} (66%)
 rename services/network/mgmt/2017-11-01/network/{securityrules.go => securityrulesgroup.go} (67%)
 rename services/network/mgmt/2017-11-01/network/{subnets.go => subnetsgroup.go} (69%)
 rename services/network/mgmt/2017-11-01/network/{usages.go => usagesgroup.go} (64%)
 rename services/network/mgmt/2017-11-01/network/{virtualnetworkgatewayconnections.go => virtualnetworkgatewayconnectionsgroup.go} (71%)
 rename services/network/mgmt/2017-11-01/network/{virtualnetworkgateways.go => virtualnetworkgatewaysgroup.go} (73%)
 rename services/network/mgmt/2017-11-01/network/{virtualnetworkpeerings.go => virtualnetworkpeeringsgroup.go} (70%)
 rename services/network/mgmt/2017-11-01/network/{virtualnetworks.go => virtualnetworksgroup.go} (71%)
 rename services/network/mgmt/2017-11-01/network/{watchers.go => watchersgroup.go} (71%)

diff --git a/services/network/mgmt/2015-05-01-preview/network/models.go b/services/network/mgmt/2015-05-01-preview/network/models.go
index ee017246c855..05d3ecd84f42 100644
--- a/services/network/mgmt/2015-05-01-preview/network/models.go
+++ b/services/network/mgmt/2015-05-01-preview/network/models.go
@@ -35,6 +35,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -49,6 +54,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -59,6 +69,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -68,6 +83,11 @@ const (
 	Basic ApplicationGatewayRequestRoutingRuleType = "Basic"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [1]ApplicationGatewayRequestRoutingRuleType {
+	return [1]ApplicationGatewayRequestRoutingRuleType{Basic}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -80,6 +100,11 @@ const (
 	StandardSmall ApplicationGatewaySkuName = "Standard_Small"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [3]ApplicationGatewaySkuName {
+	return [3]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -88,6 +113,11 @@ const (
 	Standard ApplicationGatewayTier = "Standard"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [1]ApplicationGatewayTier {
+	return [1]ApplicationGatewayTier{Standard}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -98,6 +128,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -113,6 +148,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -123,6 +163,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -135,6 +180,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -145,6 +195,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -155,6 +210,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -165,6 +225,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -177,6 +242,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -189,6 +259,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -199,6 +274,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -215,6 +295,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -225,6 +310,11 @@ const (
 	Deny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{Allow, Deny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -235,6 +325,11 @@ const (
 	Outbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{Inbound, Outbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -247,6 +342,11 @@ const (
 	UDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{Asterisk, TCP, UDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -261,6 +361,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -271,6 +376,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [2]TransportProtocol {
+	return [2]TransportProtocol{TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -285,6 +395,11 @@ const (
 	Unknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{Connected, Connecting, NotConnected, Unknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -299,6 +414,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -309,6 +429,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -319,6 +444,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets
 type AddressSpace struct {
 	// AddressPrefixes - Gets or sets List of address blocks reserved for this virtual network in CIDR notation
diff --git a/services/network/mgmt/2015-05-01-preview/network/version.go b/services/network/mgmt/2015-05-01-preview/network/version.go
index 118056ce945c..63850a4b2460 100644
--- a/services/network/mgmt/2015-05-01-preview/network/version.go
+++ b/services/network/mgmt/2015-05-01-preview/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2015-05-01-preview"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2015-06-15/network/models.go b/services/network/mgmt/2015-06-15/network/models.go
index 4301ef6fd2ad..0d52510f3d02 100644
--- a/services/network/mgmt/2015-06-15/network/models.go
+++ b/services/network/mgmt/2015-06-15/network/models.go
@@ -35,6 +35,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -49,6 +54,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -59,6 +69,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -70,6 +85,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -82,6 +102,11 @@ const (
 	StandardSmall ApplicationGatewaySkuName = "Standard_Small"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [3]ApplicationGatewaySkuName {
+	return [3]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -90,6 +115,11 @@ const (
 	Standard ApplicationGatewayTier = "Standard"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [1]ApplicationGatewayTier {
+	return [1]ApplicationGatewayTier{Standard}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -100,6 +130,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -115,6 +150,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -125,6 +165,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -137,6 +182,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -147,6 +197,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -157,6 +212,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -167,6 +227,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -179,6 +244,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -191,6 +261,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -201,6 +276,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -211,6 +291,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -227,6 +312,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -237,6 +327,11 @@ const (
 	Deny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{Allow, Deny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -247,6 +342,11 @@ const (
 	Outbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{Inbound, Outbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -259,6 +359,11 @@ const (
 	UDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{Asterisk, TCP, UDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -273,6 +378,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -283,6 +393,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [2]TransportProtocol {
+	return [2]TransportProtocol{TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -297,6 +412,11 @@ const (
 	Unknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{Connected, Connecting, NotConnected, Unknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -311,6 +431,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -323,6 +448,11 @@ const (
 	VirtualNetworkGatewaySkuNameStandard VirtualNetworkGatewaySkuName = "Standard"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [3]VirtualNetworkGatewaySkuName {
+	return [3]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -335,6 +465,11 @@ const (
 	VirtualNetworkGatewaySkuTierStandard VirtualNetworkGatewaySkuTier = "Standard"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [3]VirtualNetworkGatewaySkuTier {
+	return [3]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -345,6 +480,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -355,6 +495,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
diff --git a/services/network/mgmt/2015-06-15/network/version.go b/services/network/mgmt/2015-06-15/network/version.go
index 6890ea03f1b8..63850a4b2460 100644
--- a/services/network/mgmt/2015-06-15/network/version.go
+++ b/services/network/mgmt/2015-06-15/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2015-06-15"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2016-03-30/network/models.go b/services/network/mgmt/2016-03-30/network/models.go
index 9ed4df5b289e..5e8b389bd846 100644
--- a/services/network/mgmt/2016-03-30/network/models.go
+++ b/services/network/mgmt/2016-03-30/network/models.go
@@ -35,6 +35,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -49,6 +54,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -59,6 +69,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -70,6 +85,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -82,6 +102,11 @@ const (
 	StandardSmall ApplicationGatewaySkuName = "Standard_Small"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [3]ApplicationGatewaySkuName {
+	return [3]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -90,6 +115,11 @@ const (
 	Standard ApplicationGatewayTier = "Standard"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [1]ApplicationGatewayTier {
+	return [1]ApplicationGatewayTier{Standard}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -100,6 +130,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -115,6 +150,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -125,6 +165,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -137,6 +182,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -147,6 +197,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -157,6 +212,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -167,6 +227,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -177,6 +242,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -189,6 +259,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -201,6 +276,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -211,6 +291,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -221,6 +306,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -237,6 +327,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -247,6 +342,11 @@ const (
 	Deny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{Allow, Deny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -257,6 +357,11 @@ const (
 	Outbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{Inbound, Outbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -269,6 +374,11 @@ const (
 	UDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{Asterisk, TCP, UDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -283,6 +393,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -293,6 +408,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [2]TransportProtocol {
+	return [2]TransportProtocol{TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -307,6 +427,11 @@ const (
 	Unknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{Connected, Connecting, NotConnected, Unknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -321,6 +446,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -333,6 +463,11 @@ const (
 	VirtualNetworkGatewaySkuNameStandard VirtualNetworkGatewaySkuName = "Standard"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [3]VirtualNetworkGatewaySkuName {
+	return [3]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -345,6 +480,11 @@ const (
 	VirtualNetworkGatewaySkuTierStandard VirtualNetworkGatewaySkuTier = "Standard"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [3]VirtualNetworkGatewaySkuTier {
+	return [3]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -355,6 +495,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -365,6 +510,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets
 type AddressSpace struct {
 	// AddressPrefixes - Gets or sets List of address blocks reserved for this virtual network in CIDR notation
diff --git a/services/network/mgmt/2016-03-30/network/version.go b/services/network/mgmt/2016-03-30/network/version.go
index cb9609a04ee8..63850a4b2460 100644
--- a/services/network/mgmt/2016-03-30/network/version.go
+++ b/services/network/mgmt/2016-03-30/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2016-03-30"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2016-06-01/network/models.go b/services/network/mgmt/2016-06-01/network/models.go
index 12100b56c35d..4f126e845839 100644
--- a/services/network/mgmt/2016-06-01/network/models.go
+++ b/services/network/mgmt/2016-06-01/network/models.go
@@ -35,6 +35,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -49,6 +54,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -59,6 +69,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -70,6 +85,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -82,6 +102,11 @@ const (
 	StandardSmall ApplicationGatewaySkuName = "Standard_Small"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [3]ApplicationGatewaySkuName {
+	return [3]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -94,6 +119,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -102,6 +132,11 @@ const (
 	Standard ApplicationGatewayTier = "Standard"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [1]ApplicationGatewayTier {
+	return [1]ApplicationGatewayTier{Standard}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -112,6 +147,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -126,6 +166,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -136,6 +181,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -151,6 +201,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -161,6 +216,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -173,6 +233,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -183,6 +248,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -193,6 +263,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -203,6 +278,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -213,6 +293,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -225,6 +310,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -237,6 +327,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -247,6 +342,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -257,6 +357,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -273,6 +378,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -283,6 +393,11 @@ const (
 	Deny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{Allow, Deny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -293,6 +408,11 @@ const (
 	Outbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{Inbound, Outbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -305,6 +425,11 @@ const (
 	UDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{Asterisk, TCP, UDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -319,6 +444,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -329,6 +459,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [2]TransportProtocol {
+	return [2]TransportProtocol{TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -343,6 +478,11 @@ const (
 	Unknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{Connected, Connecting, NotConnected, Unknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -357,6 +497,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -371,6 +516,11 @@ const (
 	VirtualNetworkGatewaySkuNameUltraPerformance VirtualNetworkGatewaySkuName = "UltraPerformance"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [4]VirtualNetworkGatewaySkuName {
+	return [4]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -385,6 +535,11 @@ const (
 	VirtualNetworkGatewaySkuTierUltraPerformance VirtualNetworkGatewaySkuTier = "UltraPerformance"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [4]VirtualNetworkGatewaySkuTier {
+	return [4]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -395,6 +550,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -407,6 +567,11 @@ const (
 	VirtualNetworkPeeringStateInitiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{VirtualNetworkPeeringStateConnected, VirtualNetworkPeeringStateDisconnected, VirtualNetworkPeeringStateInitiated}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -417,6 +582,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets
 type AddressSpace struct {
 	// AddressPrefixes - Gets or sets list of address blocks reserved for this virtual network in CIDR notation
diff --git a/services/network/mgmt/2016-06-01/network/version.go b/services/network/mgmt/2016-06-01/network/version.go
index 81f62031c11a..63850a4b2460 100644
--- a/services/network/mgmt/2016-06-01/network/version.go
+++ b/services/network/mgmt/2016-06-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2016-06-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2016-09-01/network/models.go b/services/network/mgmt/2016-09-01/network/models.go
index 05d9d4943a68..35e81efae428 100644
--- a/services/network/mgmt/2016-09-01/network/models.go
+++ b/services/network/mgmt/2016-09-01/network/models.go
@@ -36,6 +36,11 @@ const (
 	Deny Access = "Deny"
 )
 
+// PossibleAccessValues returns an array of possible values for the Access const type.
+func PossibleAccessValues() [2]Access {
+	return [2]Access{Allow, Deny}
+}
+
 // ApplicationGatewayBackendHealthServerHealth enumerates the values for application gateway backend health
 // server health.
 type ApplicationGatewayBackendHealthServerHealth string
@@ -51,6 +56,11 @@ const (
 	Up ApplicationGatewayBackendHealthServerHealth = "Up"
 )
 
+// PossibleApplicationGatewayBackendHealthServerHealthValues returns an array of possible values for the ApplicationGatewayBackendHealthServerHealth const type.
+func PossibleApplicationGatewayBackendHealthServerHealthValues() [4]ApplicationGatewayBackendHealthServerHealth {
+	return [4]ApplicationGatewayBackendHealthServerHealth{Down, Partial, Unknown, Up}
+}
+
 // ApplicationGatewayCookieBasedAffinity enumerates the values for application gateway cookie based affinity.
 type ApplicationGatewayCookieBasedAffinity string
 
@@ -61,6 +71,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayFirewallMode enumerates the values for application gateway firewall mode.
 type ApplicationGatewayFirewallMode string
 
@@ -71,6 +86,11 @@ const (
 	Prevention ApplicationGatewayFirewallMode = "Prevention"
 )
 
+// PossibleApplicationGatewayFirewallModeValues returns an array of possible values for the ApplicationGatewayFirewallMode const type.
+func PossibleApplicationGatewayFirewallModeValues() [2]ApplicationGatewayFirewallMode {
+	return [2]ApplicationGatewayFirewallMode{Detection, Prevention}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -85,6 +105,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -95,6 +120,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -106,6 +136,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -122,6 +157,11 @@ const (
 	WAFMedium ApplicationGatewaySkuName = "WAF_Medium"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [5]ApplicationGatewaySkuName {
+	return [5]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall, WAFLarge, WAFMedium}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -134,6 +174,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -144,6 +189,11 @@ const (
 	WAF ApplicationGatewayTier = "WAF"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [2]ApplicationGatewayTier {
+	return [2]ApplicationGatewayTier{Standard, WAF}
+}
+
 // AssociationType enumerates the values for association type.
 type AssociationType string
 
@@ -154,6 +204,11 @@ const (
 	Contains AssociationType = "Contains"
 )
 
+// PossibleAssociationTypeValues returns an array of possible values for the AssociationType const type.
+func PossibleAssociationTypeValues() [2]AssociationType {
+	return [2]AssociationType{Associated, Contains}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -164,6 +219,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // BgpPeerState enumerates the values for bgp peer state.
 type BgpPeerState string
 
@@ -180,6 +240,11 @@ const (
 	BgpPeerStateUnknown BgpPeerState = "Unknown"
 )
 
+// PossibleBgpPeerStateValues returns an array of possible values for the BgpPeerState const type.
+func PossibleBgpPeerStateValues() [5]BgpPeerState {
+	return [5]BgpPeerState{BgpPeerStateConnected, BgpPeerStateConnecting, BgpPeerStateIdle, BgpPeerStateStopped, BgpPeerStateUnknown}
+}
+
 // Direction enumerates the values for direction.
 type Direction string
 
@@ -190,6 +255,11 @@ const (
 	Outbound Direction = "Outbound"
 )
 
+// PossibleDirectionValues returns an array of possible values for the Direction const type.
+func PossibleDirectionValues() [2]Direction {
+	return [2]Direction{Inbound, Outbound}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -204,6 +274,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -214,6 +289,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -229,6 +309,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -239,6 +324,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -251,6 +341,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -261,6 +356,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -271,6 +371,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -281,6 +386,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -291,6 +401,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -303,6 +418,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // NextHopType enumerates the values for next hop type.
 type NextHopType string
 
@@ -321,6 +441,11 @@ const (
 	NextHopTypeVnetLocal NextHopType = "VnetLocal"
 )
 
+// PossibleNextHopTypeValues returns an array of possible values for the NextHopType const type.
+func PossibleNextHopTypeValues() [6]NextHopType {
+	return [6]NextHopType{NextHopTypeHyperNetGateway, NextHopTypeInternet, NextHopTypeNone, NextHopTypeVirtualAppliance, NextHopTypeVirtualNetworkGateway, NextHopTypeVnetLocal}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -333,6 +458,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // PcError enumerates the values for pc error.
 type PcError string
 
@@ -349,6 +479,11 @@ const (
 	StorageFailed PcError = "StorageFailed"
 )
 
+// PossiblePcErrorValues returns an array of possible values for the PcError const type.
+func PossiblePcErrorValues() [5]PcError {
+	return [5]PcError{AgentStopped, CaptureFailed, InternalError, LocalFileFailed, StorageFailed}
+}
+
 // PcProtocol enumerates the values for pc protocol.
 type PcProtocol string
 
@@ -361,6 +496,11 @@ const (
 	UDP PcProtocol = "UDP"
 )
 
+// PossiblePcProtocolValues returns an array of possible values for the PcProtocol const type.
+func PossiblePcProtocolValues() [3]PcProtocol {
+	return [3]PcProtocol{Any, TCP, UDP}
+}
+
 // PcStatus enumerates the values for pc status.
 type PcStatus string
 
@@ -377,6 +517,11 @@ const (
 	PcStatusUnknown PcStatus = "Unknown"
 )
 
+// PossiblePcStatusValues returns an array of possible values for the PcStatus const type.
+func PossiblePcStatusValues() [5]PcStatus {
+	return [5]PcStatus{PcStatusError, PcStatusNotStarted, PcStatusRunning, PcStatusStopped, PcStatusUnknown}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -387,6 +532,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -397,6 +547,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // Protocol enumerates the values for protocol.
 type Protocol string
 
@@ -407,6 +562,11 @@ const (
 	ProtocolUDP Protocol = "UDP"
 )
 
+// PossibleProtocolValues returns an array of possible values for the Protocol const type.
+func PossibleProtocolValues() [2]Protocol {
+	return [2]Protocol{ProtocolTCP, ProtocolUDP}
+}
+
 // ProvisioningState enumerates the values for provisioning state.
 type ProvisioningState string
 
@@ -421,6 +581,11 @@ const (
 	ProvisioningStateUpdating ProvisioningState = "Updating"
 )
 
+// PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type.
+func PossibleProvisioningStateValues() [4]ProvisioningState {
+	return [4]ProvisioningState{ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateSucceeded, ProvisioningStateUpdating}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -437,6 +602,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -447,6 +617,11 @@ const (
 	SecurityRuleAccessDeny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{SecurityRuleAccessAllow, SecurityRuleAccessDeny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -457,6 +632,11 @@ const (
 	SecurityRuleDirectionOutbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{SecurityRuleDirectionInbound, SecurityRuleDirectionOutbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -469,6 +649,11 @@ const (
 	SecurityRuleProtocolUDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{SecurityRuleProtocolAsterisk, SecurityRuleProtocolTCP, SecurityRuleProtocolUDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -483,6 +668,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -493,6 +683,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [2]TransportProtocol {
+	return [2]TransportProtocol{TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -507,6 +702,11 @@ const (
 	VirtualNetworkGatewayConnectionStatusUnknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{VirtualNetworkGatewayConnectionStatusConnected, VirtualNetworkGatewayConnectionStatusConnecting, VirtualNetworkGatewayConnectionStatusNotConnected, VirtualNetworkGatewayConnectionStatusUnknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -521,6 +721,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -535,6 +740,11 @@ const (
 	VirtualNetworkGatewaySkuNameUltraPerformance VirtualNetworkGatewaySkuName = "UltraPerformance"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [4]VirtualNetworkGatewaySkuName {
+	return [4]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -549,6 +759,11 @@ const (
 	VirtualNetworkGatewaySkuTierUltraPerformance VirtualNetworkGatewaySkuTier = "UltraPerformance"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [4]VirtualNetworkGatewaySkuTier {
+	return [4]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -559,6 +774,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -571,6 +791,11 @@ const (
 	Initiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{Connected, Disconnected, Initiated}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -581,6 +806,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
diff --git a/services/network/mgmt/2016-09-01/network/version.go b/services/network/mgmt/2016-09-01/network/version.go
index f0fb7c135314..63850a4b2460 100644
--- a/services/network/mgmt/2016-09-01/network/version.go
+++ b/services/network/mgmt/2016-09-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2016-09-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2016-12-01/network/models.go b/services/network/mgmt/2016-12-01/network/models.go
index 3ea12ba1436d..5edce413fca9 100644
--- a/services/network/mgmt/2016-12-01/network/models.go
+++ b/services/network/mgmt/2016-12-01/network/models.go
@@ -36,6 +36,11 @@ const (
 	Deny Access = "Deny"
 )
 
+// PossibleAccessValues returns an array of possible values for the Access const type.
+func PossibleAccessValues() [2]Access {
+	return [2]Access{Allow, Deny}
+}
+
 // ApplicationGatewayBackendHealthServerHealth enumerates the values for application gateway backend health
 // server health.
 type ApplicationGatewayBackendHealthServerHealth string
@@ -51,6 +56,11 @@ const (
 	Up ApplicationGatewayBackendHealthServerHealth = "Up"
 )
 
+// PossibleApplicationGatewayBackendHealthServerHealthValues returns an array of possible values for the ApplicationGatewayBackendHealthServerHealth const type.
+func PossibleApplicationGatewayBackendHealthServerHealthValues() [4]ApplicationGatewayBackendHealthServerHealth {
+	return [4]ApplicationGatewayBackendHealthServerHealth{Down, Partial, Unknown, Up}
+}
+
 // ApplicationGatewayCookieBasedAffinity enumerates the values for application gateway cookie based affinity.
 type ApplicationGatewayCookieBasedAffinity string
 
@@ -61,6 +71,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayFirewallMode enumerates the values for application gateway firewall mode.
 type ApplicationGatewayFirewallMode string
 
@@ -71,6 +86,11 @@ const (
 	Prevention ApplicationGatewayFirewallMode = "Prevention"
 )
 
+// PossibleApplicationGatewayFirewallModeValues returns an array of possible values for the ApplicationGatewayFirewallMode const type.
+func PossibleApplicationGatewayFirewallModeValues() [2]ApplicationGatewayFirewallMode {
+	return [2]ApplicationGatewayFirewallMode{Detection, Prevention}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -85,6 +105,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -95,6 +120,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -106,6 +136,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -122,6 +157,11 @@ const (
 	WAFMedium ApplicationGatewaySkuName = "WAF_Medium"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [5]ApplicationGatewaySkuName {
+	return [5]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall, WAFLarge, WAFMedium}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -134,6 +174,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -144,6 +189,11 @@ const (
 	WAF ApplicationGatewayTier = "WAF"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [2]ApplicationGatewayTier {
+	return [2]ApplicationGatewayTier{Standard, WAF}
+}
+
 // AssociationType enumerates the values for association type.
 type AssociationType string
 
@@ -154,6 +204,11 @@ const (
 	Contains AssociationType = "Contains"
 )
 
+// PossibleAssociationTypeValues returns an array of possible values for the AssociationType const type.
+func PossibleAssociationTypeValues() [2]AssociationType {
+	return [2]AssociationType{Associated, Contains}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -164,6 +219,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // BgpPeerState enumerates the values for bgp peer state.
 type BgpPeerState string
 
@@ -180,6 +240,11 @@ const (
 	BgpPeerStateUnknown BgpPeerState = "Unknown"
 )
 
+// PossibleBgpPeerStateValues returns an array of possible values for the BgpPeerState const type.
+func PossibleBgpPeerStateValues() [5]BgpPeerState {
+	return [5]BgpPeerState{BgpPeerStateConnected, BgpPeerStateConnecting, BgpPeerStateIdle, BgpPeerStateStopped, BgpPeerStateUnknown}
+}
+
 // Direction enumerates the values for direction.
 type Direction string
 
@@ -190,6 +255,11 @@ const (
 	Outbound Direction = "Outbound"
 )
 
+// PossibleDirectionValues returns an array of possible values for the Direction const type.
+func PossibleDirectionValues() [2]Direction {
+	return [2]Direction{Inbound, Outbound}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -204,6 +274,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -214,6 +289,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -229,6 +309,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -239,6 +324,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -251,6 +341,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -261,6 +356,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -271,6 +371,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -281,6 +386,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -291,6 +401,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -303,6 +418,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // NextHopType enumerates the values for next hop type.
 type NextHopType string
 
@@ -321,6 +441,11 @@ const (
 	NextHopTypeVnetLocal NextHopType = "VnetLocal"
 )
 
+// PossibleNextHopTypeValues returns an array of possible values for the NextHopType const type.
+func PossibleNextHopTypeValues() [6]NextHopType {
+	return [6]NextHopType{NextHopTypeHyperNetGateway, NextHopTypeInternet, NextHopTypeNone, NextHopTypeVirtualAppliance, NextHopTypeVirtualNetworkGateway, NextHopTypeVnetLocal}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -333,6 +458,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // PcError enumerates the values for pc error.
 type PcError string
 
@@ -349,6 +479,11 @@ const (
 	StorageFailed PcError = "StorageFailed"
 )
 
+// PossiblePcErrorValues returns an array of possible values for the PcError const type.
+func PossiblePcErrorValues() [5]PcError {
+	return [5]PcError{AgentStopped, CaptureFailed, InternalError, LocalFileFailed, StorageFailed}
+}
+
 // PcProtocol enumerates the values for pc protocol.
 type PcProtocol string
 
@@ -361,6 +496,11 @@ const (
 	UDP PcProtocol = "UDP"
 )
 
+// PossiblePcProtocolValues returns an array of possible values for the PcProtocol const type.
+func PossiblePcProtocolValues() [3]PcProtocol {
+	return [3]PcProtocol{Any, TCP, UDP}
+}
+
 // PcStatus enumerates the values for pc status.
 type PcStatus string
 
@@ -377,6 +517,11 @@ const (
 	PcStatusUnknown PcStatus = "Unknown"
 )
 
+// PossiblePcStatusValues returns an array of possible values for the PcStatus const type.
+func PossiblePcStatusValues() [5]PcStatus {
+	return [5]PcStatus{PcStatusError, PcStatusNotStarted, PcStatusRunning, PcStatusStopped, PcStatusUnknown}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -387,6 +532,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -397,6 +547,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // Protocol enumerates the values for protocol.
 type Protocol string
 
@@ -407,6 +562,11 @@ const (
 	ProtocolUDP Protocol = "UDP"
 )
 
+// PossibleProtocolValues returns an array of possible values for the Protocol const type.
+func PossibleProtocolValues() [2]Protocol {
+	return [2]Protocol{ProtocolTCP, ProtocolUDP}
+}
+
 // ProvisioningState enumerates the values for provisioning state.
 type ProvisioningState string
 
@@ -421,6 +581,11 @@ const (
 	ProvisioningStateUpdating ProvisioningState = "Updating"
 )
 
+// PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type.
+func PossibleProvisioningStateValues() [4]ProvisioningState {
+	return [4]ProvisioningState{ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateSucceeded, ProvisioningStateUpdating}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -437,6 +602,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -447,6 +617,11 @@ const (
 	SecurityRuleAccessDeny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{SecurityRuleAccessAllow, SecurityRuleAccessDeny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -457,6 +632,11 @@ const (
 	SecurityRuleDirectionOutbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{SecurityRuleDirectionInbound, SecurityRuleDirectionOutbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -469,6 +649,11 @@ const (
 	SecurityRuleProtocolUDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{SecurityRuleProtocolAsterisk, SecurityRuleProtocolTCP, SecurityRuleProtocolUDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -483,6 +668,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -493,6 +683,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [2]TransportProtocol {
+	return [2]TransportProtocol{TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -507,6 +702,11 @@ const (
 	VirtualNetworkGatewayConnectionStatusUnknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{VirtualNetworkGatewayConnectionStatusConnected, VirtualNetworkGatewayConnectionStatusConnecting, VirtualNetworkGatewayConnectionStatusNotConnected, VirtualNetworkGatewayConnectionStatusUnknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -521,6 +721,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -535,6 +740,11 @@ const (
 	VirtualNetworkGatewaySkuNameUltraPerformance VirtualNetworkGatewaySkuName = "UltraPerformance"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [4]VirtualNetworkGatewaySkuName {
+	return [4]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -549,6 +759,11 @@ const (
 	VirtualNetworkGatewaySkuTierUltraPerformance VirtualNetworkGatewaySkuTier = "UltraPerformance"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [4]VirtualNetworkGatewaySkuTier {
+	return [4]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -559,6 +774,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -571,6 +791,11 @@ const (
 	Initiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{Connected, Disconnected, Initiated}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -581,6 +806,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
diff --git a/services/network/mgmt/2016-12-01/network/version.go b/services/network/mgmt/2016-12-01/network/version.go
index 4a329f9041f5..63850a4b2460 100644
--- a/services/network/mgmt/2016-12-01/network/version.go
+++ b/services/network/mgmt/2016-12-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2016-12-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2017-03-01/network/applicationgateways.go b/services/network/mgmt/2017-03-01/network/applicationgatewaysgroup.go
similarity index 71%
rename from services/network/mgmt/2017-03-01/network/applicationgateways.go
rename to services/network/mgmt/2017-03-01/network/applicationgatewaysgroup.go
index 7576d8982178..9af29d308f8d 100644
--- a/services/network/mgmt/2017-03-01/network/applicationgateways.go
+++ b/services/network/mgmt/2017-03-01/network/applicationgatewaysgroup.go
@@ -25,35 +25,35 @@ import (
 	"net/http"
 )
 
-// ApplicationGatewaysClient is the network Client
-type ApplicationGatewaysClient struct {
+// ApplicationGatewaysGroupClient is the network Client
+type ApplicationGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewApplicationGatewaysClient creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
-	return NewApplicationGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewApplicationGatewaysGroupClient creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClient(subscriptionID string) ApplicationGatewaysGroupClient {
+	return NewApplicationGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewApplicationGatewaysClientWithBaseURI creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
-	return ApplicationGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewApplicationGatewaysGroupClientWithBaseURI creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysGroupClient {
+	return ApplicationGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // BackendHealth gets the backend health of the specified application gateway in a resource group.
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. expand is expands BackendAddressPool and BackendHttpSettings referenced in backend health.
-func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	req, err := client.BackendHealthPreparer(ctx, resourceGroupName, applicationGatewayName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.BackendHealthSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resou
 }
 
 // BackendHealthPreparer prepares the BackendHealth request.
-func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Contex
 
 // BackendHealthSender sends the BackendHealth request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (
 
 // BackendHealthResponder handles the response to the BackendHealth request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,7 +116,7 @@ func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. parameters is parameters supplied to the create or update application gateway operation.
-func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ApplicationGatewayPropertiesFormat", Name: validation.Null, Rule: false,
@@ -126,18 +126,18 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 						{Target: "parameters.ApplicationGatewayPropertiesFormat.WebApplicationFirewallConfiguration.RuleSetVersion", Name: validation.Null, Rule: true, Chain: nil},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ApplicationGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ApplicationGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -145,7 +145,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -169,7 +169,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +184,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -199,16 +199,16 @@ func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -216,7 +216,7 @@ func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGrou
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -238,7 +238,7 @@ func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, reso
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteSender(req *http.Request) (future ApplicationGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -253,7 +253,7 @@ func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -267,30 +267,30 @@ func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -312,14 +312,14 @@ func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourc
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,31 +333,31 @@ func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (resul
 // List lists all application gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ApplicationGatewaysClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -378,14 +378,14 @@ func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resour
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -397,10 +397,10 @@ func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (resu
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -408,47 +408,47 @@ func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationG
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the application gateways in a subscription.
-func (client ApplicationGatewaysClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -468,14 +468,14 @@ func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*h
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -487,10 +487,10 @@ func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (r
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -498,46 +498,46 @@ func (client ApplicationGatewaysClient) listAllNextResults(lastResults Applicati
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
 
 // ListAvailableWafRuleSets lists all available web application firewall rule sets.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	req, err := client.ListAvailableWafRuleSetsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableWafRuleSetsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableWafRuleSetsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableWafRuleSetsPreparer prepares the ListAvailableWafRuleSets request.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -557,14 +557,14 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx con
 
 // ListAvailableWafRuleSetsSender sends the ListAvailableWafRuleSets request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableWafRuleSetsResponder handles the response to the ListAvailableWafRuleSets request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -579,16 +579,16 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStartFuture, err error) {
 	req, err := client.StartPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StartSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -596,7 +596,7 @@ func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroup
 }
 
 // StartPreparer prepares the Start request.
-func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -618,7 +618,7 @@ func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resou
 
 // StartSender sends the Start request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StartSender(req *http.Request) (future ApplicationGatewaysGroupStartFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -633,7 +633,7 @@ func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future A
 
 // StartResponder handles the response to the Start request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -647,16 +647,16 @@ func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -664,7 +664,7 @@ func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupN
 }
 
 // StopPreparer prepares the Stop request.
-func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -686,7 +686,7 @@ func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resour
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StopSender(req *http.Request) (future ApplicationGatewaysGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -701,7 +701,7 @@ func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future Ap
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-03-01/network/bgpservicecommunities.go b/services/network/mgmt/2017-03-01/network/bgpservicecommunitiesgroup.go
similarity index 63%
rename from services/network/mgmt/2017-03-01/network/bgpservicecommunities.go
rename to services/network/mgmt/2017-03-01/network/bgpservicecommunitiesgroup.go
index e0bcb69de50c..b576541095d8 100644
--- a/services/network/mgmt/2017-03-01/network/bgpservicecommunities.go
+++ b/services/network/mgmt/2017-03-01/network/bgpservicecommunitiesgroup.go
@@ -24,47 +24,47 @@ import (
 	"net/http"
 )
 
-// BgpServiceCommunitiesClient is the network Client
-type BgpServiceCommunitiesClient struct {
+// BgpServiceCommunitiesGroupClient is the network Client
+type BgpServiceCommunitiesGroupClient struct {
 	BaseClient
 }
 
-// NewBgpServiceCommunitiesClient creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
-	return NewBgpServiceCommunitiesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewBgpServiceCommunitiesGroupClient creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClient(subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return NewBgpServiceCommunitiesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewBgpServiceCommunitiesClientWithBaseURI creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
-	return BgpServiceCommunitiesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewBgpServiceCommunitiesGroupClientWithBaseURI creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return BgpServiceCommunitiesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available bgp service communities.
-func (client BgpServiceCommunitiesClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
+func (client BgpServiceCommunitiesGroupClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.bsclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.bsclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client BgpServiceCommunitiesGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -84,14 +84,14 @@ func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*ht
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client BgpServiceCommunitiesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client BgpServiceCommunitiesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -103,10 +103,10 @@ func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
 	req, err := lastResults.bgpServiceCommunityListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -114,17 +114,17 @@ func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpService
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client BgpServiceCommunitiesClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/client.go b/services/network/mgmt/2017-03-01/network/client.go
index eb7d627a76a7..c94ce1ee38a6 100644
--- a/services/network/mgmt/2017-03-01/network/client.go
+++ b/services/network/mgmt/2017-03-01/network/client.go
@@ -21,10 +21,7 @@ package network
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 
 import (
-	"context"
 	"github.com/Azure/go-autorest/autorest"
-	"github.com/Azure/go-autorest/autorest/azure"
-	"net/http"
 )
 
 const (
@@ -52,72 +49,3 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
 		SubscriptionID: subscriptionID,
 	}
 }
-
-// CheckDNSNameAvailability checks whether a domain name in the cloudapp.net zone is available for use.
-//
-// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
-// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
-func (client BaseClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
-	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
-		return
-	}
-
-	resp, err := client.CheckDNSNameAvailabilitySender(req)
-	if err != nil {
-		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure sending request")
-		return
-	}
-
-	result, err = client.CheckDNSNameAvailabilityResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
-	}
-
-	return
-}
-
-// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
-func (client BaseClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
-	pathParameters := map[string]interface{}{
-		"location":       autorest.Encode("path", location),
-		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
-	}
-
-	const APIVersion = "2017-03-01"
-	queryParameters := map[string]interface{}{
-		"api-version": APIVersion,
-	}
-	if len(domainNameLabel) > 0 {
-		queryParameters["domainNameLabel"] = autorest.Encode("query", domainNameLabel)
-	}
-
-	preparer := autorest.CreatePreparer(
-		autorest.AsGet(),
-		autorest.WithBaseURL(client.BaseURI),
-		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
-		autorest.WithQueryParameters(queryParameters))
-	return preparer.Prepare((&http.Request{}).WithContext(ctx))
-}
-
-// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
-// http.Response Body if it receives an error.
-func (client BaseClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
-	return autorest.SendWithSender(client, req,
-		azure.DoRetryWithRegistration(client.Client))
-}
-
-// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
-// closes the http.Response Body.
-func (client BaseClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
-	err = autorest.Respond(
-		resp,
-		client.ByInspecting(),
-		azure.WithErrorUnlessStatusCode(http.StatusOK),
-		autorest.ByUnmarshallingJSON(&result),
-		autorest.ByClosing())
-	result.Response = autorest.Response{Response: resp}
-	return
-}
diff --git a/services/network/mgmt/2017-03-01/network/expressroutecircuitauthorizations.go b/services/network/mgmt/2017-03-01/network/expressroutecircuitauthorizationsgroup.go
similarity index 67%
rename from services/network/mgmt/2017-03-01/network/expressroutecircuitauthorizations.go
rename to services/network/mgmt/2017-03-01/network/expressroutecircuitauthorizationsgroup.go
index 887c74a80f2a..9847201828ac 100644
--- a/services/network/mgmt/2017-03-01/network/expressroutecircuitauthorizations.go
+++ b/services/network/mgmt/2017-03-01/network/expressroutecircuitauthorizationsgroup.go
@@ -24,21 +24,21 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitAuthorizationsClient is the network Client
-type ExpressRouteCircuitAuthorizationsClient struct {
+// ExpressRouteCircuitAuthorizationsGroupClient is the network Client
+type ExpressRouteCircuitAuthorizationsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitAuthorizationsClient creates an instance of the ExpressRouteCircuitAuthorizationsClient
-// client.
-func NewExpressRouteCircuitAuthorizationsClient(subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return NewExpressRouteCircuitAuthorizationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitAuthorizationsGroupClient creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClient(subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitAuthorizationsClientWithBaseURI creates an instance of the
-// ExpressRouteCircuitAuthorizationsClient client.
-func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return ExpressRouteCircuitAuthorizationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return ExpressRouteCircuitAuthorizationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an authorization in the specified express route circuit.
@@ -46,16 +46,16 @@ func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subsc
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization. authorizationParameters is parameters supplied to the create
 // or update express route circuit authorization operation.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, authorizationName, authorizationParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -63,7 +63,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -88,7 +88,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -103,7 +103,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -118,16 +118,16 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(re
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -135,7 +135,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -158,7 +158,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -173,7 +173,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Req
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -187,30 +187,30 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -233,14 +233,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Co
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -254,31 +254,31 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Re
 // List gets all authorizations in an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit.
-func (client ExpressRouteCircuitAuthorizationsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.alr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.alr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -300,14 +300,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.C
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -319,10 +319,10 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.R
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
 	req, err := lastResults.authorizationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -330,17 +330,17 @@ func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitAuthorizationsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/expressroutecircuitpeerings.go b/services/network/mgmt/2017-03-01/network/expressroutecircuitpeeringsgroup.go
similarity index 68%
rename from services/network/mgmt/2017-03-01/network/expressroutecircuitpeerings.go
rename to services/network/mgmt/2017-03-01/network/expressroutecircuitpeeringsgroup.go
index f5781a7b9993..38d7cd9c8dab 100644
--- a/services/network/mgmt/2017-03-01/network/expressroutecircuitpeerings.go
+++ b/services/network/mgmt/2017-03-01/network/expressroutecircuitpeeringsgroup.go
@@ -24,19 +24,20 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitPeeringsClient is the network Client
-type ExpressRouteCircuitPeeringsClient struct {
+// ExpressRouteCircuitPeeringsGroupClient is the network Client
+type ExpressRouteCircuitPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitPeeringsClient creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return NewExpressRouteCircuitPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitPeeringsGroupClient creates an instance of the ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClient(subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitPeeringsClientWithBaseURI creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return ExpressRouteCircuitPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitPeeringsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return ExpressRouteCircuitPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified express route circuits.
@@ -44,16 +45,16 @@ func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptio
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. peeringParameters is parameters supplied to the create or update express
 // route circuit peering operation.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, peeringName, peeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +62,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Conte
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -86,7 +87,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +102,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.R
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +117,16 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +134,7 @@ func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, reso
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -156,7 +157,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Conte
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +172,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request)
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +186,30 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -231,14 +232,14 @@ func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context,
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +253,31 @@ func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response
 // List gets all peerings in a specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitPeeringsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ercplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ercplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -298,14 +299,14 @@ func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +318,10 @@ func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Respons
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
 	req, err := lastResults.expressRouteCircuitPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +329,17 @@ func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults Expr
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/expressroutecircuits.go b/services/network/mgmt/2017-03-01/network/expressroutecircuitsgroup.go
similarity index 71%
rename from services/network/mgmt/2017-03-01/network/expressroutecircuits.go
rename to services/network/mgmt/2017-03-01/network/expressroutecircuitsgroup.go
index f58677327974..61d779f9e27c 100644
--- a/services/network/mgmt/2017-03-01/network/expressroutecircuits.go
+++ b/services/network/mgmt/2017-03-01/network/expressroutecircuitsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitsClient is the network Client
-type ExpressRouteCircuitsClient struct {
+// ExpressRouteCircuitsGroupClient is the network Client
+type ExpressRouteCircuitsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitsClient creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
-	return NewExpressRouteCircuitsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitsGroupClient creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClient(subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return NewExpressRouteCircuitsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitsClientWithBaseURI creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
-	return ExpressRouteCircuitsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitsGroupClientWithBaseURI creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return ExpressRouteCircuitsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is
 // parameters supplied to the create or update express route circuit operation.
-func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Resp
 // Delete deletes the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -180,30 +180,30 @@ func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (r
 // Get gets information about the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of express route circuit.
-func (client ExpressRouteCircuitsClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -225,14 +225,14 @@ func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -247,30 +247,30 @@ func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitsClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetPeeringStatsPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetPeeringStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetPeeringStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPeeringStatsPreparer prepares the GetPeeringStats request.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -293,14 +293,14 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Con
 
 // GetPeeringStatsSender sends the GetPeeringStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetPeeringStatsResponder handles the response to the GetPeeringStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,30 +314,30 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Res
 // GetStats gets all the stats from an express route circuit in a resource group.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetStatsPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetStatsPreparer prepares the GetStats request.
-func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -359,14 +359,14 @@ func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, r
 
 // GetStatsSender sends the GetStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetStatsResponder handles the response to the GetStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -380,31 +380,31 @@ func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response)
 // List gets all the express route circuits in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ExpressRouteCircuitsClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -425,14 +425,14 @@ func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -444,10 +444,10 @@ func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -455,47 +455,47 @@ func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRout
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the express route circuits in a subscription.
-func (client ExpressRouteCircuitsClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -515,14 +515,14 @@ func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -534,10 +534,10 @@ func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -545,17 +545,17 @@ func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressR
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -564,16 +564,16 @@ func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (r
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	req, err := client.ListArpTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListArpTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -581,7 +581,7 @@ func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resou
 }
 
 // ListArpTablePreparer prepares the ListArpTable request.
-func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -605,7 +605,7 @@ func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Contex
 
 // ListArpTableSender sends the ListArpTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -620,7 +620,7 @@ func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (
 
 // ListArpTableResponder handles the response to the ListArpTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -636,16 +636,16 @@ func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	req, err := client.ListRoutesTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -653,7 +653,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, re
 }
 
 // ListRoutesTablePreparer prepares the ListRoutesTable request.
-func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -677,7 +677,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Con
 
 // ListRoutesTableSender sends the ListRoutesTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -692,7 +692,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request
 
 // ListRoutesTableResponder handles the response to the ListRoutesTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -708,16 +708,16 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	req, err := client.ListRoutesTableSummaryPreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSummarySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -725,7 +725,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Cont
 }
 
 // ListRoutesTableSummaryPreparer prepares the ListRoutesTableSummary request.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -749,7 +749,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx cont
 
 // ListRoutesTableSummarySender sends the ListRoutesTableSummary request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -764,7 +764,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.
 
 // ListRoutesTableSummaryResponder handles the response to the ListRoutesTableSummary request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-03-01/network/expressrouteserviceproviders.go b/services/network/mgmt/2017-03-01/network/expressrouteserviceprovidersgroup.go
similarity index 61%
rename from services/network/mgmt/2017-03-01/network/expressrouteserviceproviders.go
rename to services/network/mgmt/2017-03-01/network/expressrouteserviceprovidersgroup.go
index 0d01f02575eb..809fd8b40f12 100644
--- a/services/network/mgmt/2017-03-01/network/expressrouteserviceproviders.go
+++ b/services/network/mgmt/2017-03-01/network/expressrouteserviceprovidersgroup.go
@@ -24,48 +24,49 @@ import (
 	"net/http"
 )
 
-// ExpressRouteServiceProvidersClient is the network Client
-type ExpressRouteServiceProvidersClient struct {
+// ExpressRouteServiceProvidersGroupClient is the network Client
+type ExpressRouteServiceProvidersGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteServiceProvidersClient creates an instance of the ExpressRouteServiceProvidersClient client.
-func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
-	return NewExpressRouteServiceProvidersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteServiceProvidersGroupClient creates an instance of the ExpressRouteServiceProvidersGroupClient
+// client.
+func NewExpressRouteServiceProvidersGroupClient(subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return NewExpressRouteServiceProvidersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteServiceProvidersClientWithBaseURI creates an instance of the ExpressRouteServiceProvidersClient
-// client.
-func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
-	return ExpressRouteServiceProvidersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteServiceProvidersGroupClientWithBaseURI creates an instance of the
+// ExpressRouteServiceProvidersGroupClient client.
+func NewExpressRouteServiceProvidersGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return ExpressRouteServiceProvidersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available express route service providers.
-func (client ExpressRouteServiceProvidersClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ersplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ersplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -85,14 +86,14 @@ func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteServiceProvidersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -104,10 +105,10 @@ func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Respon
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
 	req, err := lastResults.expressRouteServiceProviderListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -115,17 +116,17 @@ func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults Exp
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteServiceProvidersClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/group.go b/services/network/mgmt/2017-03-01/network/group.go
new file mode 100644
index 000000000000..e0131b0c16e9
--- /dev/null
+++ b/services/network/mgmt/2017-03-01/network/group.go
@@ -0,0 +1,109 @@
+package network
+
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"context"
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"net/http"
+)
+
+// GroupClient is the network Client
+type GroupClient struct {
+	BaseClient
+}
+
+// NewGroupClient creates an instance of the GroupClient client.
+func NewGroupClient(subscriptionID string) GroupClient {
+	return NewGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
+}
+
+// NewGroupClientWithBaseURI creates an instance of the GroupClient client.
+func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
+	return GroupClient{NewWithBaseURI(baseURI, subscriptionID)}
+}
+
+// CheckDNSNameAvailability checks whether a domain name in the cloudapp.net zone is available for use.
+//
+// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
+// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+func (client GroupClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
+	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := client.CheckDNSNameAvailabilitySender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure sending request")
+		return
+	}
+
+	result, err = client.CheckDNSNameAvailabilityResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
+	}
+
+	return
+}
+
+// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
+func (client GroupClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
+	pathParameters := map[string]interface{}{
+		"location":       autorest.Encode("path", location),
+		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
+	}
+
+	const APIVersion = "2017-03-01"
+	queryParameters := map[string]interface{}{
+		"api-version": APIVersion,
+	}
+	if len(domainNameLabel) > 0 {
+		queryParameters["domainNameLabel"] = autorest.Encode("query", domainNameLabel)
+	}
+
+	preparer := autorest.CreatePreparer(
+		autorest.AsGet(),
+		autorest.WithBaseURL(client.BaseURI),
+		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
+		autorest.WithQueryParameters(queryParameters))
+	return preparer.Prepare((&http.Request{}).WithContext(ctx))
+}
+
+// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
+// http.Response Body if it receives an error.
+func (client GroupClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
+	return autorest.SendWithSender(client, req,
+		azure.DoRetryWithRegistration(client.Client))
+}
+
+// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
+// closes the http.Response Body.
+func (client GroupClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
+	err = autorest.Respond(
+		resp,
+		client.ByInspecting(),
+		azure.WithErrorUnlessStatusCode(http.StatusOK),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}
diff --git a/services/network/mgmt/2017-03-01/network/interfaces.go b/services/network/mgmt/2017-03-01/network/interfacesgroup.go
similarity index 66%
rename from services/network/mgmt/2017-03-01/network/interfaces.go
rename to services/network/mgmt/2017-03-01/network/interfacesgroup.go
index d82ca5b72a0a..ccd810d341bc 100644
--- a/services/network/mgmt/2017-03-01/network/interfaces.go
+++ b/services/network/mgmt/2017-03-01/network/interfacesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// InterfacesClient is the network Client
-type InterfacesClient struct {
+// InterfacesGroupClient is the network Client
+type InterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewInterfacesClient creates an instance of the InterfacesClient client.
-func NewInterfacesClient(subscriptionID string) InterfacesClient {
-	return NewInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfacesGroupClient creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClient(subscriptionID string) InterfacesGroupClient {
+	return NewInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfacesClientWithBaseURI creates an instance of the InterfacesClient client.
-func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
-	return InterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfacesGroupClientWithBaseURI creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfacesGroupClient {
+	return InterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // parameters is parameters supplied to the create or update network interface operation.
-func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkInterfaceName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroup
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
+func (client InterfacesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resou
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateSender(req *http.Request) (future InterfacesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future I
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (res
 // Delete deletes the specified network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName str
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroup
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) DeleteSender(req *http.Request) (future InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) DeleteSender(req *http.Request) (future InterfacesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client InterfacesClient) DeleteSender(req *http.Request) (future Interface
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InterfacesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client InterfacesClient) DeleteResponder(resp *http.Response) (result auto
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // expand is expands referenced resources.
-func (client InterfacesClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupNam
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,16 +250,16 @@ func (client InterfacesClient) GetResponder(resp *http.Response) (result Interfa
 // GetEffectiveRouteTable gets all route tables applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	req, err := client.GetEffectiveRouteTablePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetEffectiveRouteTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -267,7 +267,7 @@ func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resou
 }
 
 // GetEffectiveRouteTablePreparer prepares the GetEffectiveRouteTable request.
-func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -289,7 +289,7 @@ func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Contex
 
 // GetEffectiveRouteTableSender sends the GetEffectiveRouteTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -304,7 +304,7 @@ func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (
 
 // GetEffectiveRouteTableResponder handles the response to the GetEffectiveRouteTable request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,30 +320,30 @@ func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Respon
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. expand is expands referenced resources.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetNetworkInterfaceSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetNetworkInterfaceResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetNetworkInterfacePreparer prepares the GetVirtualMachineScaleSetNetworkInterface request.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
@@ -370,14 +370,14 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer
 
 // GetVirtualMachineScaleSetNetworkInterfaceSender sends the GetVirtualMachineScaleSetNetworkInterface request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetNetworkInterfaceResponder handles the response to the GetVirtualMachineScaleSetNetworkInterface request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -391,31 +391,31 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponde
 // List gets all network interfaces in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client InterfacesClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -436,14 +436,14 @@ func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupNa
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -455,10 +455,10 @@ func (client InterfacesClient) ListResponder(resp *http.Response) (result Interf
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -466,47 +466,47 @@ func (client InterfacesClient) listNextResults(lastResults InterfaceListResult)
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network interfaces in a subscription.
-func (client InterfacesClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client InterfacesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -526,14 +526,14 @@ func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Reque
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -545,10 +545,10 @@ func (client InterfacesClient) ListAllResponder(resp *http.Response) (result Int
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -556,17 +556,17 @@ func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResul
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -574,16 +574,16 @@ func (client InterfacesClient) ListAllComplete(ctx context.Context) (result Inte
 // ListEffectiveNetworkSecurityGroups gets all network security groups applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	req, err := client.ListEffectiveNetworkSecurityGroupsPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListEffectiveNetworkSecurityGroupsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -591,7 +591,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Co
 }
 
 // ListEffectiveNetworkSecurityGroupsPreparer prepares the ListEffectiveNetworkSecurityGroups request.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -613,7 +613,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx co
 
 // ListEffectiveNetworkSecurityGroupsSender sends the ListEffectiveNetworkSecurityGroups request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -628,7 +628,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *htt
 
 // ListEffectiveNetworkSecurityGroupsResponder handles the response to the ListEffectiveNetworkSecurityGroups request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -643,31 +643,31 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -689,14 +689,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPrepar
 
 // ListVirtualMachineScaleSetNetworkInterfacesSender sends the ListVirtualMachineScaleSetNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -708,10 +708,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesRespon
 }
 
 // listVirtualMachineScaleSetNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -719,17 +719,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextRe
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -739,31 +739,31 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComple
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetVMNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -786,14 +786,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPrep
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesSender sends the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -805,10 +805,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResp
 }
 
 // listVirtualMachineScaleSetVMNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -816,17 +816,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNext
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/loadbalancers.go b/services/network/mgmt/2017-03-01/network/loadbalancersgroup.go
similarity index 65%
rename from services/network/mgmt/2017-03-01/network/loadbalancers.go
rename to services/network/mgmt/2017-03-01/network/loadbalancersgroup.go
index 55e4512aeb65..b1d3b124031e 100644
--- a/services/network/mgmt/2017-03-01/network/loadbalancers.go
+++ b/services/network/mgmt/2017-03-01/network/loadbalancersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// LoadBalancersClient is the network Client
-type LoadBalancersClient struct {
+// LoadBalancersGroupClient is the network Client
+type LoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancersClient creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClient(subscriptionID string) LoadBalancersClient {
-	return NewLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancersGroupClient creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClient(subscriptionID string) LoadBalancersGroupClient {
+	return NewLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancersClientWithBaseURI creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersClient {
-	return LoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancersGroupClientWithBaseURI creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersGroupClient {
+	return LoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // parameters is parameters supplied to the create or update load balancer operation.
-func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
+func (client LoadBalancersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (
 // Delete deletes the specified load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) DeleteSender(req *http.Request) (future LoadBalancersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBa
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LoadBalancersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. expand
 // is expands referenced resources.
-func (client LoadBalancersClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client LoadBalancersClient) GetResponder(resp *http.Response) (result Load
 // List gets all the load balancers in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LoadBalancersClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client LoadBalancersClient) ListResponder(resp *http.Response) (result Loa
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the load balancers in a subscription.
-func (client LoadBalancersClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Re
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerLis
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/localnetworkgateways.go b/services/network/mgmt/2017-03-01/network/localnetworkgatewaysgroup.go
similarity index 71%
rename from services/network/mgmt/2017-03-01/network/localnetworkgateways.go
rename to services/network/mgmt/2017-03-01/network/localnetworkgatewaysgroup.go
index ac8f06a98879..ed030dccf038 100644
--- a/services/network/mgmt/2017-03-01/network/localnetworkgateways.go
+++ b/services/network/mgmt/2017-03-01/network/localnetworkgatewaysgroup.go
@@ -25,43 +25,43 @@ import (
 	"net/http"
 )
 
-// LocalNetworkGatewaysClient is the network Client
-type LocalNetworkGatewaysClient struct {
+// LocalNetworkGatewaysGroupClient is the network Client
+type LocalNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewLocalNetworkGatewaysClient creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
-	return NewLocalNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLocalNetworkGatewaysGroupClient creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClient(subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return NewLocalNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLocalNetworkGatewaysClientWithBaseURI creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
-	return LocalNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLocalNetworkGatewaysGroupClientWithBaseURI creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return LocalNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a local network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway. parameters is parameters supplied to the create or update local network gateway operation.
-func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}},
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, localNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -69,7 +69,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -93,7 +93,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -108,7 +108,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -123,22 +123,22 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Resp
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Delete", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Delete", err.Error())
 	}
 
 	req, err := client.DeletePreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -146,7 +146,7 @@ func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -168,7 +168,7 @@ func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -183,7 +183,7 @@ func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -197,36 +197,36 @@ func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Get", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Get", err.Error())
 	}
 
 	req, err := client.GetPreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -248,14 +248,14 @@ func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -269,31 +269,31 @@ func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (resu
 // List gets all the local network gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LocalNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
+func (client LocalNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -314,14 +314,14 @@ func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,10 +333,10 @@ func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
 	req, err := lastResults.localNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -344,17 +344,17 @@ func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetwor
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/models.go b/services/network/mgmt/2017-03-01/network/models.go
index 4891d16a8024..c956cedf95a4 100644
--- a/services/network/mgmt/2017-03-01/network/models.go
+++ b/services/network/mgmt/2017-03-01/network/models.go
@@ -36,6 +36,11 @@ const (
 	Deny Access = "Deny"
 )
 
+// PossibleAccessValues returns an array of possible values for the Access const type.
+func PossibleAccessValues() [2]Access {
+	return [2]Access{Allow, Deny}
+}
+
 // ApplicationGatewayBackendHealthServerHealth enumerates the values for application gateway backend health
 // server health.
 type ApplicationGatewayBackendHealthServerHealth string
@@ -53,6 +58,11 @@ const (
 	Up ApplicationGatewayBackendHealthServerHealth = "Up"
 )
 
+// PossibleApplicationGatewayBackendHealthServerHealthValues returns an array of possible values for the ApplicationGatewayBackendHealthServerHealth const type.
+func PossibleApplicationGatewayBackendHealthServerHealthValues() [5]ApplicationGatewayBackendHealthServerHealth {
+	return [5]ApplicationGatewayBackendHealthServerHealth{Down, Draining, Partial, Unknown, Up}
+}
+
 // ApplicationGatewayCookieBasedAffinity enumerates the values for application gateway cookie based affinity.
 type ApplicationGatewayCookieBasedAffinity string
 
@@ -63,6 +73,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayFirewallMode enumerates the values for application gateway firewall mode.
 type ApplicationGatewayFirewallMode string
 
@@ -73,6 +88,11 @@ const (
 	Prevention ApplicationGatewayFirewallMode = "Prevention"
 )
 
+// PossibleApplicationGatewayFirewallModeValues returns an array of possible values for the ApplicationGatewayFirewallMode const type.
+func PossibleApplicationGatewayFirewallModeValues() [2]ApplicationGatewayFirewallMode {
+	return [2]ApplicationGatewayFirewallMode{Detection, Prevention}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -87,6 +107,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -97,6 +122,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -108,6 +138,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -124,6 +159,11 @@ const (
 	WAFMedium ApplicationGatewaySkuName = "WAF_Medium"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [5]ApplicationGatewaySkuName {
+	return [5]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall, WAFLarge, WAFMedium}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -136,6 +176,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -146,6 +191,11 @@ const (
 	WAF ApplicationGatewayTier = "WAF"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [2]ApplicationGatewayTier {
+	return [2]ApplicationGatewayTier{Standard, WAF}
+}
+
 // AssociationType enumerates the values for association type.
 type AssociationType string
 
@@ -156,6 +206,11 @@ const (
 	Contains AssociationType = "Contains"
 )
 
+// PossibleAssociationTypeValues returns an array of possible values for the AssociationType const type.
+func PossibleAssociationTypeValues() [2]AssociationType {
+	return [2]AssociationType{Associated, Contains}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -166,6 +221,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // BgpPeerState enumerates the values for bgp peer state.
 type BgpPeerState string
 
@@ -182,6 +242,11 @@ const (
 	BgpPeerStateUnknown BgpPeerState = "Unknown"
 )
 
+// PossibleBgpPeerStateValues returns an array of possible values for the BgpPeerState const type.
+func PossibleBgpPeerStateValues() [5]BgpPeerState {
+	return [5]BgpPeerState{BgpPeerStateConnected, BgpPeerStateConnecting, BgpPeerStateIdle, BgpPeerStateStopped, BgpPeerStateUnknown}
+}
+
 // ConnectionStatus enumerates the values for connection status.
 type ConnectionStatus string
 
@@ -196,6 +261,11 @@ const (
 	ConnectionStatusUnknown ConnectionStatus = "Unknown"
 )
 
+// PossibleConnectionStatusValues returns an array of possible values for the ConnectionStatus const type.
+func PossibleConnectionStatusValues() [4]ConnectionStatus {
+	return [4]ConnectionStatus{ConnectionStatusConnected, ConnectionStatusDegraded, ConnectionStatusDisconnected, ConnectionStatusUnknown}
+}
+
 // DhGroup enumerates the values for dh group.
 type DhGroup string
 
@@ -218,6 +288,11 @@ const (
 	None DhGroup = "None"
 )
 
+// PossibleDhGroupValues returns an array of possible values for the DhGroup const type.
+func PossibleDhGroupValues() [8]DhGroup {
+	return [8]DhGroup{DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+}
+
 // Direction enumerates the values for direction.
 type Direction string
 
@@ -228,6 +303,11 @@ const (
 	Outbound Direction = "Outbound"
 )
 
+// PossibleDirectionValues returns an array of possible values for the Direction const type.
+func PossibleDirectionValues() [2]Direction {
+	return [2]Direction{Inbound, Outbound}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -242,6 +322,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -252,6 +337,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -267,6 +357,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -277,6 +372,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -289,6 +389,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -299,6 +404,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -309,6 +419,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IkeEncryption enumerates the values for ike encryption.
 type IkeEncryption string
 
@@ -325,6 +440,11 @@ const (
 	DES3 IkeEncryption = "DES3"
 )
 
+// PossibleIkeEncryptionValues returns an array of possible values for the IkeEncryption const type.
+func PossibleIkeEncryptionValues() [5]IkeEncryption {
+	return [5]IkeEncryption{AES128, AES192, AES256, DES, DES3}
+}
+
 // IkeIntegrity enumerates the values for ike integrity.
 type IkeIntegrity string
 
@@ -339,6 +459,11 @@ const (
 	SHA384 IkeIntegrity = "SHA384"
 )
 
+// PossibleIkeIntegrityValues returns an array of possible values for the IkeIntegrity const type.
+func PossibleIkeIntegrityValues() [4]IkeIntegrity {
+	return [4]IkeIntegrity{MD5, SHA1, SHA256, SHA384}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -349,6 +474,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IpsecEncryption enumerates the values for ipsec encryption.
 type IpsecEncryption string
 
@@ -373,6 +503,11 @@ const (
 	IpsecEncryptionNone IpsecEncryption = "None"
 )
 
+// PossibleIpsecEncryptionValues returns an array of possible values for the IpsecEncryption const type.
+func PossibleIpsecEncryptionValues() [9]IpsecEncryption {
+	return [9]IpsecEncryption{IpsecEncryptionAES128, IpsecEncryptionAES192, IpsecEncryptionAES256, IpsecEncryptionDES, IpsecEncryptionDES3, IpsecEncryptionGCMAES128, IpsecEncryptionGCMAES192, IpsecEncryptionGCMAES256, IpsecEncryptionNone}
+}
+
 // IpsecIntegrity enumerates the values for ipsec integrity.
 type IpsecIntegrity string
 
@@ -391,6 +526,11 @@ const (
 	IpsecIntegritySHA256 IpsecIntegrity = "SHA256"
 )
 
+// PossibleIpsecIntegrityValues returns an array of possible values for the IpsecIntegrity const type.
+func PossibleIpsecIntegrityValues() [6]IpsecIntegrity {
+	return [6]IpsecIntegrity{IpsecIntegrityGCMAES128, IpsecIntegrityGCMAES192, IpsecIntegrityGCMAES256, IpsecIntegrityMD5, IpsecIntegritySHA1, IpsecIntegritySHA256}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -401,6 +541,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // IssueType enumerates the values for issue type.
 type IssueType string
 
@@ -425,6 +570,11 @@ const (
 	IssueTypeUserDefinedRoute IssueType = "UserDefinedRoute"
 )
 
+// PossibleIssueTypeValues returns an array of possible values for the IssueType const type.
+func PossibleIssueTypeValues() [9]IssueType {
+	return [9]IssueType{IssueTypeAgentStopped, IssueTypeDNSResolution, IssueTypeGuestFirewall, IssueTypeNetworkSecurityRule, IssueTypePlatform, IssueTypePortThrottled, IssueTypeSocketBind, IssueTypeUnknown, IssueTypeUserDefinedRoute}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -437,6 +587,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // NextHopType enumerates the values for next hop type.
 type NextHopType string
 
@@ -455,6 +610,11 @@ const (
 	NextHopTypeVnetLocal NextHopType = "VnetLocal"
 )
 
+// PossibleNextHopTypeValues returns an array of possible values for the NextHopType const type.
+func PossibleNextHopTypeValues() [6]NextHopType {
+	return [6]NextHopType{NextHopTypeHyperNetGateway, NextHopTypeInternet, NextHopTypeNone, NextHopTypeVirtualAppliance, NextHopTypeVirtualNetworkGateway, NextHopTypeVnetLocal}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -467,6 +627,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // Origin enumerates the values for origin.
 type Origin string
 
@@ -479,6 +644,11 @@ const (
 	OriginOutbound Origin = "Outbound"
 )
 
+// PossibleOriginValues returns an array of possible values for the Origin const type.
+func PossibleOriginValues() [3]Origin {
+	return [3]Origin{OriginInbound, OriginLocal, OriginOutbound}
+}
+
 // PcError enumerates the values for pc error.
 type PcError string
 
@@ -495,6 +665,11 @@ const (
 	StorageFailed PcError = "StorageFailed"
 )
 
+// PossiblePcErrorValues returns an array of possible values for the PcError const type.
+func PossiblePcErrorValues() [5]PcError {
+	return [5]PcError{AgentStopped, CaptureFailed, InternalError, LocalFileFailed, StorageFailed}
+}
+
 // PcProtocol enumerates the values for pc protocol.
 type PcProtocol string
 
@@ -507,6 +682,11 @@ const (
 	UDP PcProtocol = "UDP"
 )
 
+// PossiblePcProtocolValues returns an array of possible values for the PcProtocol const type.
+func PossiblePcProtocolValues() [3]PcProtocol {
+	return [3]PcProtocol{Any, TCP, UDP}
+}
+
 // PcStatus enumerates the values for pc status.
 type PcStatus string
 
@@ -523,6 +703,11 @@ const (
 	PcStatusUnknown PcStatus = "Unknown"
 )
 
+// PossiblePcStatusValues returns an array of possible values for the PcStatus const type.
+func PossiblePcStatusValues() [5]PcStatus {
+	return [5]PcStatus{PcStatusError, PcStatusNotStarted, PcStatusRunning, PcStatusStopped, PcStatusUnknown}
+}
+
 // PfsGroup enumerates the values for pfs group.
 type PfsGroup string
 
@@ -543,6 +728,11 @@ const (
 	PfsGroupPFS24 PfsGroup = "PFS24"
 )
 
+// PossiblePfsGroupValues returns an array of possible values for the PfsGroup const type.
+func PossiblePfsGroupValues() [7]PfsGroup {
+	return [7]PfsGroup{PfsGroupECP256, PfsGroupECP384, PfsGroupNone, PfsGroupPFS1, PfsGroupPFS2, PfsGroupPFS2048, PfsGroupPFS24}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -553,6 +743,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -563,6 +758,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // Protocol enumerates the values for protocol.
 type Protocol string
 
@@ -573,6 +773,11 @@ const (
 	ProtocolUDP Protocol = "UDP"
 )
 
+// PossibleProtocolValues returns an array of possible values for the Protocol const type.
+func PossibleProtocolValues() [2]Protocol {
+	return [2]Protocol{ProtocolTCP, ProtocolUDP}
+}
+
 // ProvisioningState enumerates the values for provisioning state.
 type ProvisioningState string
 
@@ -587,6 +792,11 @@ const (
 	ProvisioningStateUpdating ProvisioningState = "Updating"
 )
 
+// PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type.
+func PossibleProvisioningStateValues() [4]ProvisioningState {
+	return [4]ProvisioningState{ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateSucceeded, ProvisioningStateUpdating}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -603,6 +813,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -613,6 +828,11 @@ const (
 	SecurityRuleAccessDeny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{SecurityRuleAccessAllow, SecurityRuleAccessDeny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -623,6 +843,11 @@ const (
 	SecurityRuleDirectionOutbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{SecurityRuleDirectionInbound, SecurityRuleDirectionOutbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -635,6 +860,11 @@ const (
 	SecurityRuleProtocolUDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{SecurityRuleProtocolAsterisk, SecurityRuleProtocolTCP, SecurityRuleProtocolUDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -649,6 +879,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // Severity enumerates the values for severity.
 type Severity string
 
@@ -659,6 +894,11 @@ const (
 	SeverityWarning Severity = "Warning"
 )
 
+// PossibleSeverityValues returns an array of possible values for the Severity const type.
+func PossibleSeverityValues() [2]Severity {
+	return [2]Severity{SeverityError, SeverityWarning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -669,6 +909,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [2]TransportProtocol {
+	return [2]TransportProtocol{TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -683,6 +928,11 @@ const (
 	VirtualNetworkGatewayConnectionStatusUnknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{VirtualNetworkGatewayConnectionStatusConnected, VirtualNetworkGatewayConnectionStatusConnecting, VirtualNetworkGatewayConnectionStatusNotConnected, VirtualNetworkGatewayConnectionStatusUnknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -697,6 +947,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -717,6 +972,11 @@ const (
 	VirtualNetworkGatewaySkuNameVpnGw3 VirtualNetworkGatewaySkuName = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [7]VirtualNetworkGatewaySkuName {
+	return [7]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance, VirtualNetworkGatewaySkuNameVpnGw1, VirtualNetworkGatewaySkuNameVpnGw2, VirtualNetworkGatewaySkuNameVpnGw3}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -737,6 +997,11 @@ const (
 	VirtualNetworkGatewaySkuTierVpnGw3 VirtualNetworkGatewaySkuTier = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [7]VirtualNetworkGatewaySkuTier {
+	return [7]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance, VirtualNetworkGatewaySkuTierVpnGw1, VirtualNetworkGatewaySkuTierVpnGw2, VirtualNetworkGatewaySkuTierVpnGw3}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -747,6 +1012,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -759,6 +1029,11 @@ const (
 	Initiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{Connected, Disconnected, Initiated}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -769,6 +1044,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
@@ -2000,29 +2280,29 @@ type ApplicationGatewayRequestRoutingRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// ApplicationGatewaysBackendHealthFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupBackendHealthFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysBackendHealthFuture struct {
+type ApplicationGatewaysGroupBackendHealthFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGatewaysClient) (agbh ApplicationGatewayBackendHealth, err error) {
+func (future ApplicationGatewaysGroupBackendHealthFuture) Result(client ApplicationGatewaysGroupClient) (agbh ApplicationGatewayBackendHealth, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysBackendHealthFuture")
+		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupBackendHealthFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		agbh, err = client.BackendHealthResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2039,39 +2319,39 @@ func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGa
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	agbh, err = client.BackendHealthResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysCreateOrUpdateFuture struct {
+type ApplicationGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) {
+func (future ApplicationGatewaysGroupCreateOrUpdateFuture) Result(client ApplicationGatewaysGroupClient) (ag ApplicationGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysCreateOrUpdateFuture")
+		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ag, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2088,39 +2368,39 @@ func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationG
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ag, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ApplicationGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ApplicationGatewaysDeleteFuture struct {
+type ApplicationGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
+func (future ApplicationGatewaysGroupDeleteFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2137,12 +2417,110 @@ func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStartFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStartFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStartFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStartFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StartResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StartResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStopFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStopFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStopFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StopResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StopResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -2237,104 +2615,6 @@ type ApplicationGatewaySslPolicy struct {
 	DisabledSslProtocols *[]ApplicationGatewaySslProtocol `json:"disabledSslProtocols,omitempty"`
 }
 
-// ApplicationGatewaysStartFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStartFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStartFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StartResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StartResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
-// ApplicationGatewaysStopFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStopFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStopFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StopResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StopResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
 // ApplicationGatewayURLPathMap urlPathMaps give a url path to the backend mapping information for
 // PathBasedRouting.
 type ApplicationGatewayURLPathMap struct {
@@ -3296,29 +3576,29 @@ func (erca *ExpressRouteCircuitAuthorization) UnmarshalJSON(body []byte) error {
 	return nil
 }
 
-// ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results
-// of a long-running operation.
-type ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (erca ExpressRouteCircuitAuthorization, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (erca ExpressRouteCircuitAuthorization, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture")
+		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erca, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3335,39 +3615,39 @@ func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(clien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erca, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitAuthorizationsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitAuthorizationsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitAuthorizationsDeleteFuture struct {
+type ExpressRouteCircuitAuthorizationsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3384,12 +3664,12 @@ func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client Expres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -3713,29 +3993,29 @@ type ExpressRouteCircuitPeeringPropertiesFormat struct {
 	Ipv6PeeringConfig *Ipv6ExpressRouteCircuitPeeringConfig `json:"ipv6PeeringConfig,omitempty"`
 }
 
-// ExpressRouteCircuitPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitPeeringsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsClient) (ercp ExpressRouteCircuitPeering, err error) {
+func (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ercp ExpressRouteCircuitPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture")
+		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3752,39 +4032,39 @@ func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client Expr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitPeeringsDeleteFuture struct {
+type ExpressRouteCircuitPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRouteCircuitPeeringsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitPeeringsGroupDeleteFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3801,12 +4081,12 @@ func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRoute
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -3872,29 +4152,39 @@ type ExpressRouteCircuitsArpTableListResult struct {
 	NextLink *string `json:"nextLink,omitempty"`
 }
 
-// ExpressRouteCircuitsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
+type ExpressRouteCircuitServiceProviderProperties struct {
+	// ServiceProviderName - The serviceProviderName.
+	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
+	// PeeringLocation - The peering location.
+	PeeringLocation *string `json:"peeringLocation,omitempty"`
+	// BandwidthInMbps - The BandwidthInMbps.
+	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
+}
+
+// ExpressRouteCircuitsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsCreateOrUpdateFuture struct {
+type ExpressRouteCircuitsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) {
+func (future ExpressRouteCircuitsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitsGroupClient) (erc ExpressRouteCircuit, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsCreateOrUpdateFuture")
+		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3911,39 +4201,39 @@ func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRout
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ExpressRouteCircuitsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ExpressRouteCircuitsDeleteFuture struct {
+type ExpressRouteCircuitsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuitsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitsGroupDeleteFuture) Result(client ExpressRouteCircuitsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3960,59 +4250,39 @@ func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuit
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
-type ExpressRouteCircuitServiceProviderProperties struct {
-	// ServiceProviderName - The serviceProviderName.
-	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
-	// PeeringLocation - The peering location.
-	PeeringLocation *string `json:"peeringLocation,omitempty"`
-	// BandwidthInMbps - The BandwidthInMbps.
-	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
-}
-
-// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
-type ExpressRouteCircuitSku struct {
-	// Name - The name of the SKU.
-	Name *string `json:"name,omitempty"`
-	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
-	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
-	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
-	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
-}
-
-// ExpressRouteCircuitsListArpTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListArpTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListArpTableFuture struct {
+type ExpressRouteCircuitsGroupListArpTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteCircuitsClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListArpTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListArpTableFuture")
+		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListArpTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercatlr, err = client.ListArpTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4029,39 +4299,39 @@ func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercatlr, err = client.ListArpTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListRoutesTableFuture struct {
+type ExpressRouteCircuitsGroupListRoutesTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRouteCircuitsClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableFuture")
+		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtlr, err = client.ListRoutesTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4078,39 +4348,39 @@ func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtlr, err = client.ListRoutesTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitsListRoutesTableSummaryFuture struct {
+// ExpressRouteCircuitsGroupListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type ExpressRouteCircuitsGroupListRoutesTableSummaryFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableSummaryFuture")
+		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtslr, err = client.ListRoutesTableSummaryResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4127,16 +4397,26 @@ func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client Exp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtslr, err = client.ListRoutesTableSummaryResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
+type ExpressRouteCircuitSku struct {
+	// Name - The name of the SKU.
+	Name *string `json:"name,omitempty"`
+	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
+	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
+	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
+	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
+}
+
 // ExpressRouteCircuitsRoutesTableListResult response for ListRoutesTable associated with the Express Route
 // Circuits API.
 type ExpressRouteCircuitsRoutesTableListResult struct {
@@ -5078,29 +5358,29 @@ type InterfacePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InterfacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// InterfacesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InterfacesCreateOrUpdateFuture struct {
+type InterfacesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i Interface, err error) {
+func (future InterfacesGroupCreateOrUpdateFuture) Result(client InterfacesGroupClient) (i Interface, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return i, azure.NewAsyncOpIncompleteError("network.InterfacesCreateOrUpdateFuture")
+		return i, azure.NewAsyncOpIncompleteError("network.InterfacesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		i, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5117,38 +5397,39 @@ func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	i, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type InterfacesDeleteFuture struct {
+// InterfacesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type InterfacesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autorest.Response, err error) {
+func (future InterfacesGroupDeleteFuture) Result(client InterfacesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5165,39 +5446,39 @@ func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autores
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
+// InterfacesGroupGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type InterfacesGetEffectiveRouteTableFuture struct {
+type InterfacesGroupGetEffectiveRouteTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesClient) (erlr EffectiveRouteListResult, err error) {
+func (future InterfacesGroupGetEffectiveRouteTableFuture) Result(client InterfacesGroupClient) (erlr EffectiveRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGetEffectiveRouteTableFuture")
+		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupGetEffectiveRouteTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erlr, err = client.GetEffectiveRouteTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5214,39 +5495,39 @@ func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erlr, err = client.GetEffectiveRouteTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type InterfacesListEffectiveNetworkSecurityGroupsFuture struct {
+// InterfacesGroupListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type InterfacesGroupListEffectiveNetworkSecurityGroupsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
+func (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesGroupClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesListEffectiveNetworkSecurityGroupsFuture")
+		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5263,12 +5544,12 @@ func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client I
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -5639,29 +5920,29 @@ type LoadBalancerPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LoadBalancersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type LoadBalancersCreateOrUpdateFuture struct {
+// LoadBalancersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type LoadBalancersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) {
+func (future LoadBalancersGroupCreateOrUpdateFuture) Result(client LoadBalancersGroupClient) (lb LoadBalancer, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersCreateOrUpdateFuture")
+		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lb, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5678,38 +5959,39 @@ func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lb, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LoadBalancersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type LoadBalancersDeleteFuture struct {
+// LoadBalancersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type LoadBalancersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar autorest.Response, err error) {
+func (future LoadBalancersGroupDeleteFuture) Result(client LoadBalancersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5726,12 +6008,12 @@ func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -6061,29 +6343,29 @@ type LocalNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LocalNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// LocalNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type LocalNetworkGatewaysCreateOrUpdateFuture struct {
+type LocalNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) {
+func (future LocalNetworkGatewaysGroupCreateOrUpdateFuture) Result(client LocalNetworkGatewaysGroupClient) (lng LocalNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysCreateOrUpdateFuture")
+		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6100,39 +6382,39 @@ func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetwor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LocalNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// LocalNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type LocalNetworkGatewaysDeleteFuture struct {
+type LocalNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future LocalNetworkGatewaysGroupDeleteFuture) Result(client LocalNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6149,12 +6431,12 @@ func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGateway
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -6415,28 +6697,29 @@ type PacketCaptureResultProperties struct {
 	Filters            *[]PacketCaptureFilter        `json:"filters,omitempty"`
 }
 
-// PacketCapturesCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesCreateFuture struct {
+// PacketCapturesGroupCreateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupCreateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pcr PacketCaptureResult, err error) {
+func (future PacketCapturesGroupCreateFuture) Result(client PacketCapturesGroupClient) (pcr PacketCaptureResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesCreateFuture")
+		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupCreateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcr, err = client.CreateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6453,38 +6736,39 @@ func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pc
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcr, err = client.CreateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesDeleteFuture struct {
+// PacketCapturesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupDeleteFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6501,39 +6785,39 @@ func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// PacketCapturesGroupGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PacketCapturesGetStatusFuture struct {
+type PacketCapturesGroupGetStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
+func (future PacketCapturesGroupGetStatusFuture) Result(client PacketCapturesGroupClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGetStatusFuture")
+		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupGetStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcqsr, err = client.GetStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6550,38 +6834,39 @@ func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcqsr, err = client.GetStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesStopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesStopFuture struct {
+// PacketCapturesGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupStopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupStopFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesStopFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupStopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6598,12 +6883,12 @@ func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -7033,29 +7318,29 @@ type PublicIPAddressDNSSettings struct {
 	ReverseFqdn *string `json:"reverseFqdn,omitempty"`
 }
 
-// PublicIPAddressesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type PublicIPAddressesCreateOrUpdateFuture struct {
+// PublicIPAddressesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type PublicIPAddressesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) {
+func (future PublicIPAddressesGroupCreateOrUpdateFuture) Result(client PublicIPAddressesGroupClient) (pia PublicIPAddress, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesCreateOrUpdateFuture")
+		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pia, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7072,39 +7357,39 @@ func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pia, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PublicIPAddressesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// PublicIPAddressesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PublicIPAddressesDeleteFuture struct {
+type PublicIPAddressesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClient) (ar autorest.Response, err error) {
+func (future PublicIPAddressesGroupDeleteFuture) Result(client PublicIPAddressesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7121,12 +7406,12 @@ func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -7893,29 +8178,29 @@ type RouteFilterRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteFilterRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type RouteFilterRulesCreateOrUpdateFuture struct {
+// RouteFilterRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type RouteFilterRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupCreateOrUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesCreateOrUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7932,39 +8217,39 @@ func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRule
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesDeleteFuture struct {
+type RouteFilterRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) (ar autorest.Response, err error) {
+func (future RouteFilterRulesGroupDeleteFuture) Result(client RouteFilterRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7981,39 +8266,39 @@ func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesUpdateFuture struct {
+type RouteFilterRulesGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8030,39 +8315,39 @@ func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFiltersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFiltersCreateOrUpdateFuture struct {
+type RouteFiltersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupCreateOrUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersCreateOrUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8079,38 +8364,39 @@ func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersDeleteFuture struct {
+// RouteFiltersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar autorest.Response, err error) {
+func (future RouteFiltersGroupDeleteFuture) Result(client RouteFiltersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8127,38 +8413,39 @@ func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar aut
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersUpdateFuture struct {
+// RouteFiltersGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8175,12 +8462,12 @@ func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf Rou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -8299,28 +8586,29 @@ type RoutePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RoutesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesCreateOrUpdateFuture struct {
+// RoutesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RoutesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, err error) {
+func (future RoutesGroupCreateOrUpdateFuture) Result(client RoutesGroupClient) (r Route, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return r, azure.NewAsyncOpIncompleteError("network.RoutesCreateOrUpdateFuture")
+		return r, azure.NewAsyncOpIncompleteError("network.RoutesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		r, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8337,38 +8625,38 @@ func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, e
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	r, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RoutesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesDeleteFuture struct {
+// RoutesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type RoutesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Response, err error) {
+func (future RoutesGroupDeleteFuture) Result(client RoutesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RoutesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RoutesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8385,12 +8673,12 @@ func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Respon
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -8630,29 +8918,29 @@ type RouteTablePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteTablesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteTablesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteTablesCreateOrUpdateFuture struct {
+type RouteTablesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (rt RouteTable, err error) {
+func (future RouteTablesGroupCreateOrUpdateFuture) Result(client RouteTablesGroupClient) (rt RouteTable, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesCreateOrUpdateFuture")
+		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rt, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8669,38 +8957,39 @@ func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rt, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteTablesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteTablesDeleteFuture struct {
+// RouteTablesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteTablesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autorest.Response, err error) {
+func (future RouteTablesGroupDeleteFuture) Result(client RouteTablesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8717,12 +9006,12 @@ func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -8975,29 +9264,29 @@ type SecurityGroupPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityGroupsCreateOrUpdateFuture struct {
+// SecurityGroupsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityGroupsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) {
+func (future SecurityGroupsGroupCreateOrUpdateFuture) Result(client SecurityGroupsGroupClient) (sg SecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsCreateOrUpdateFuture")
+		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sg, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9014,38 +9303,39 @@ func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sg, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityGroupsDeleteFuture struct {
+// SecurityGroupsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityGroupsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar autorest.Response, err error) {
+func (future SecurityGroupsGroupDeleteFuture) Result(client SecurityGroupsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9062,12 +9352,12 @@ func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -9285,29 +9575,29 @@ type SecurityRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityRulesCreateOrUpdateFuture struct {
+// SecurityRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClient) (sr SecurityRule, err error) {
+func (future SecurityRulesGroupCreateOrUpdateFuture) Result(client SecurityRulesGroupClient) (sr SecurityRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesCreateOrUpdateFuture")
+		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9324,38 +9614,39 @@ func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityRulesDeleteFuture struct {
+// SecurityRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar autorest.Response, err error) {
+func (future SecurityRulesGroupDeleteFuture) Result(client SecurityRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9372,12 +9663,12 @@ func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -9577,29 +9868,29 @@ type SubnetPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SubnetsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// SubnetsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type SubnetsCreateOrUpdateFuture struct {
+type SubnetsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet, err error) {
+func (future SubnetsGroupCreateOrUpdateFuture) Result(client SubnetsGroupClient) (s Subnet, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.SubnetsCreateOrUpdateFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.SubnetsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9616,38 +9907,38 @@ func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SubnetsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SubnetsDeleteFuture struct {
+// SubnetsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type SubnetsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Response, err error) {
+func (future SubnetsGroupDeleteFuture) Result(client SubnetsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9664,12 +9955,12 @@ func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Resp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10479,29 +10770,29 @@ type VirtualNetworkGatewayConnectionPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewayConnectionsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsCreateOrUpdateFuture struct {
+// VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngc VirtualNetworkGatewayConnection, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (vngc VirtualNetworkGatewayConnection, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture")
+		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vngc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10518,39 +10809,39 @@ func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vngc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewayConnectionsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewayConnectionsDeleteFuture struct {
+type VirtualNetworkGatewayConnectionsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client VirtualNetworkGatewayConnectionsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupDeleteFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10567,39 +10858,39 @@ func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsResetSharedKeyFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsResetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (crsk ConnectionResetSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (crsk ConnectionResetSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture")
+		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		crsk, err = client.ResetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10616,39 +10907,39 @@ func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	crsk, err = client.ResetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsSetSharedKeyFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewayConnectionsSetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (csk ConnectionSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (csk ConnectionSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture")
+		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		csk, err = client.SetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10665,12 +10956,12 @@ func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client V
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	csk, err = client.SetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10877,29 +11168,29 @@ type VirtualNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysCreateOrUpdateFuture struct {
+type VirtualNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysCreateOrUpdateFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10916,39 +11207,39 @@ func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysDeleteFuture struct {
+// VirtualNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewaysGroupDeleteFuture) Result(client VirtualNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10965,39 +11256,39 @@ func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGat
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGetAdvertisedRoutesFuture struct {
+// VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetAdvertisedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11014,39 +11305,39 @@ func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client Virt
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetAdvertisedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetBgpPeerStatusFuture struct {
+type VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysClient) (bpslr BgpPeerStatusListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysGroupClient) (bpslr BgpPeerStatusListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetBgpPeerStatusFuture")
+		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		bpslr, err = client.GetBgpPeerStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11063,39 +11354,39 @@ func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	bpslr, err = client.GetBgpPeerStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetLearnedRoutesFuture struct {
+type VirtualNetworkGatewaysGroupGetLearnedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetLearnedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetLearnedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11112,49 +11403,39 @@ func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetLearnedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
-type VirtualNetworkGatewaySku struct {
-	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
-	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
-	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
-	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
-	// Capacity - The capacity.
-	Capacity *int32 `json:"capacity,omitempty"`
-}
-
-// VirtualNetworkGatewaysResetFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysResetFuture struct {
+// VirtualNetworkGatewaysGroupResetFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupResetFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupResetFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysResetFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupResetFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.ResetResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11171,16 +11452,26 @@ func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGate
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.ResetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
+type VirtualNetworkGatewaySku struct {
+	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
+	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
+	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
+	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
+	// Capacity - The capacity.
+	Capacity *int32 `json:"capacity,omitempty"`
+}
+
 // VirtualNetworkListResult response for the ListVirtualNetworks API service call.
 type VirtualNetworkListResult struct {
 	autorest.Response `json:"-"`
@@ -11569,29 +11860,29 @@ type VirtualNetworkPeeringPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkPeeringsCreateOrUpdateFuture struct {
+type VirtualNetworkPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsClient) (vnp VirtualNetworkPeering, err error) {
+func (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsGroupClient) (vnp VirtualNetworkPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsCreateOrUpdateFuture")
+		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vnp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11608,39 +11899,39 @@ func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vnp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkPeeringsDeleteFuture struct {
+// VirtualNetworkPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPeeringsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkPeeringsGroupDeleteFuture) Result(client VirtualNetworkPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11657,12 +11948,12 @@ func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPee
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11683,29 +11974,29 @@ type VirtualNetworkPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworksCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworksCreateOrUpdateFuture struct {
+// VirtualNetworksGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworksGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) {
+func (future VirtualNetworksGroupCreateOrUpdateFuture) Result(client VirtualNetworksGroupClient) (vn VirtualNetwork, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksCreateOrUpdateFuture")
+		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vn, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11722,39 +12013,39 @@ func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vn, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworksDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// VirtualNetworksGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type VirtualNetworksDeleteFuture struct {
+type VirtualNetworksGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (ar autorest.Response, err error) {
+func (future VirtualNetworksGroupDeleteFuture) Result(client VirtualNetworksGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11771,12 +12062,12 @@ func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12095,29 +12386,29 @@ type WatcherPropertiesFormat struct {
 	ProvisioningState ProvisioningState `json:"provisioningState,omitempty"`
 }
 
-// WatchersCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersCheckConnectivityFuture struct {
+type WatchersGroupCheckConnectivityFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci ConnectivityInformation, err error) {
+func (future WatchersGroupCheckConnectivityFuture) Result(client WatchersGroupClient) (ci ConnectivityInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ci, azure.NewAsyncOpIncompleteError("network.WatchersCheckConnectivityFuture")
+		return ci, azure.NewAsyncOpIncompleteError("network.WatchersGroupCheckConnectivityFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ci, err = client.CheckConnectivityResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12134,38 +12425,38 @@ func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ci, err = client.CheckConnectivityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersDeleteFuture struct {
+// WatchersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type WatchersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Response, err error) {
+func (future WatchersGroupDeleteFuture) Result(client WatchersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.WatchersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.WatchersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12182,39 +12473,39 @@ func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Re
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetFlowLogStatusFuture struct {
+type WatchersGroupGetFlowLogStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupGetFlowLogStatusFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGetFlowLogStatusFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetFlowLogStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.GetFlowLogStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12231,38 +12522,39 @@ func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.GetFlowLogStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersGetNextHopFuture struct {
+// WatchersGroupGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupGetNextHopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHopResult, err error) {
+func (future WatchersGroupGetNextHopFuture) Result(client WatchersGroupClient) (nhr NextHopResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGetNextHopFuture")
+		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetNextHopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		nhr, err = client.GetNextHopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12279,39 +12571,39 @@ func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHo
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	nhr, err = client.GetNextHopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetTroubleshootingFuture struct {
+type WatchersGroupGetTroubleshootingFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12328,39 +12620,39 @@ func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
+// WatchersGroupGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type WatchersGetTroubleshootingResultFuture struct {
+type WatchersGroupGetTroubleshootingResultFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingResultFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingResultFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingResultFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResultResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12377,39 +12669,39 @@ func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResultResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetVMSecurityRulesFuture struct {
+type WatchersGroupGetVMSecurityRulesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sgvr SecurityGroupViewResult, err error) {
+func (future WatchersGroupGetVMSecurityRulesFuture) Result(client WatchersGroupClient) (sgvr SecurityGroupViewResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGetVMSecurityRulesFuture")
+		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetVMSecurityRulesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sgvr, err = client.GetVMSecurityRulesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12426,39 +12718,39 @@ func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sg
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sgvr, err = client.GetVMSecurityRulesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type WatchersSetFlowLogConfigurationFuture struct {
+// WatchersGroupSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type WatchersGroupSetFlowLogConfigurationFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupSetFlowLogConfigurationFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersSetFlowLogConfigurationFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupSetFlowLogConfigurationFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.SetFlowLogConfigurationResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12475,38 +12767,39 @@ func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.SetFlowLogConfigurationResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersVerifyIPFlowFuture struct {
+// WatchersGroupVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupVerifyIPFlowFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr VerificationIPFlowResult, err error) {
+func (future WatchersGroupVerifyIPFlowFuture) Result(client WatchersGroupClient) (vifr VerificationIPFlowResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersVerifyIPFlowFuture")
+		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersGroupVerifyIPFlowFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vifr, err = client.VerifyIPFlowResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12523,12 +12816,12 @@ func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr Ver
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vifr, err = client.VerifyIPFlowResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/packetcaptures.go b/services/network/mgmt/2017-03-01/network/packetcapturesgroup.go
similarity index 71%
rename from services/network/mgmt/2017-03-01/network/packetcaptures.go
rename to services/network/mgmt/2017-03-01/network/packetcapturesgroup.go
index 18e4eccf8846..5fa43c7dc77e 100644
--- a/services/network/mgmt/2017-03-01/network/packetcaptures.go
+++ b/services/network/mgmt/2017-03-01/network/packetcapturesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// PacketCapturesClient is the network Client
-type PacketCapturesClient struct {
+// PacketCapturesGroupClient is the network Client
+type PacketCapturesGroupClient struct {
 	BaseClient
 }
 
-// NewPacketCapturesClient creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
-	return NewPacketCapturesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPacketCapturesGroupClient creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClient(subscriptionID string) PacketCapturesGroupClient {
+	return NewPacketCapturesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPacketCapturesClientWithBaseURI creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
-	return PacketCapturesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPacketCapturesGroupClientWithBaseURI creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesGroupClient {
+	return PacketCapturesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Create create and start a packet capture on the specified VM.
@@ -45,25 +45,25 @@ func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) P
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session. parameters is parameters that define the create
 // packet capture operation.
-func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesGroupCreateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PacketCaptureParameters", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.PacketCaptureParameters.Target", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "parameters.PacketCaptureParameters.StorageLocation", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PacketCapturesClient", "Create", err.Error())
+		return result, validation.NewError("network.PacketCapturesGroupClient", "Create", err.Error())
 	}
 
 	req, err := client.CreatePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName
 }
 
 // CreatePreparer prepares the Create request.
-func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
+func (client PacketCapturesGroupClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -96,7 +96,7 @@ func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceG
 
 // CreateSender sends the Create request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) CreateSender(req *http.Request) (future PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) CreateSender(req *http.Request) (future PacketCapturesGroupCreateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PacketCapturesClient) CreateSender(req *http.Request) (future Packe
 
 // CreateResponder handles the response to the Create request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -166,7 +166,7 @@ func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) DeleteSender(req *http.Request) (future PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) DeleteSender(req *http.Request) (future PacketCapturesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client PacketCapturesClient) DeleteSender(req *http.Request) (future Packe
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -241,14 +241,14 @@ func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -263,16 +263,16 @@ func (client PacketCapturesClient) GetResponder(resp *http.Response) (result Pac
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource. packetCaptureName is the name given to the packet capture session.
-func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupGetStatusFuture, err error) {
 	req, err := client.GetStatusPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -280,7 +280,7 @@ func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupN
 }
 
 // GetStatusPreparer prepares the GetStatus request.
-func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -303,7 +303,7 @@ func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resour
 
 // GetStatusSender sends the GetStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatusSender(req *http.Request) (future PacketCapturesGroupGetStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -318,7 +318,7 @@ func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future Pa
 
 // GetStatusResponder handles the response to the GetStatus request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
+func (client PacketCapturesGroupClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource.
-func (client PacketCapturesClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -378,14 +378,14 @@ func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -400,16 +400,16 @@ func (client PacketCapturesClient) ListResponder(resp *http.Response) (result Pa
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -417,7 +417,7 @@ func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName s
 }
 
 // StopPreparer prepares the Stop request.
-func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -440,7 +440,7 @@ func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGro
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) StopSender(req *http.Request) (future PacketCapturesGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -455,7 +455,7 @@ func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketC
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-03-01/network/publicipaddresses.go b/services/network/mgmt/2017-03-01/network/publicipaddressesgroup.go
similarity index 70%
rename from services/network/mgmt/2017-03-01/network/publicipaddresses.go
rename to services/network/mgmt/2017-03-01/network/publicipaddressesgroup.go
index 95805f453f14..34092144e82a 100644
--- a/services/network/mgmt/2017-03-01/network/publicipaddresses.go
+++ b/services/network/mgmt/2017-03-01/network/publicipaddressesgroup.go
@@ -25,26 +25,26 @@ import (
 	"net/http"
 )
 
-// PublicIPAddressesClient is the network Client
-type PublicIPAddressesClient struct {
+// PublicIPAddressesGroupClient is the network Client
+type PublicIPAddressesGroupClient struct {
 	BaseClient
 }
 
-// NewPublicIPAddressesClient creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
-	return NewPublicIPAddressesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPublicIPAddressesGroupClient creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClient(subscriptionID string) PublicIPAddressesGroupClient {
+	return NewPublicIPAddressesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPublicIPAddressesClientWithBaseURI creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
-	return PublicIPAddressesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPublicIPAddressesGroupClientWithBaseURI creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesGroupClient {
+	return PublicIPAddressesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a static or dynamic public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address.
 // parameters is parameters supplied to the create or update public IP address operation.
-func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat", Name: validation.Null, Rule: false,
@@ -53,18 +53,18 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 						Chain: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat.IPConfiguration.IPConfigurationPropertiesFormat.PublicIPAddress", Name: validation.Null, Rule: false, Chain: nil}}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PublicIPAddressesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.PublicIPAddressesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, publicIPAddressName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -72,7 +72,7 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -96,7 +96,7 @@ func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (f
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -125,16 +125,16 @@ func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Respons
 // Delete deletes the specified public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet.
-func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, publicIPAddressName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -142,7 +142,7 @@ func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupN
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -164,7 +164,7 @@ func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resour
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) DeleteSender(req *http.Request) (future PublicIPAddressesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -179,7 +179,7 @@ func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future Pu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PublicIPAddressesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -193,30 +193,30 @@ func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet. expand is
 // expands referenced resources.
-func (client PublicIPAddressesClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -241,14 +241,14 @@ func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceG
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -265,30 +265,30 @@ func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. IPConfigurationName is the name of the IP configuration. publicIPAddressName is the name of
 // the public IP Address. expand is expands referenced resources.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetPublicIPAddressSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetPublicIPAddressResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressPreparer prepares the GetVirtualMachineScaleSetPublicIPAddress request.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -317,14 +317,14 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPr
 
 // GetVirtualMachineScaleSetPublicIPAddressSender sends the GetVirtualMachineScaleSetPublicIPAddress request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressResponder handles the response to the GetVirtualMachineScaleSetPublicIPAddress request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -338,31 +338,31 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressRe
 // List gets all public IP addresses in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client PublicIPAddressesClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -383,14 +383,14 @@ func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resource
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -402,10 +402,10 @@ func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -413,47 +413,47 @@ func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddres
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the public IP addresses in a subscription.
-func (client PublicIPAddressesClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -473,14 +473,14 @@ func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*htt
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -492,10 +492,10 @@ func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (res
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -503,17 +503,17 @@ func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAdd
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -523,31 +523,31 @@ func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (resu
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -569,14 +569,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 
 // ListVirtualMachineScaleSetPublicIPAddressesSender sends the ListVirtualMachineScaleSetPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -588,10 +588,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 }
 
 // listVirtualMachineScaleSetPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -599,17 +599,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddresse
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -620,31 +620,31 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the network
 // interface name. IPConfigurationName is the IP configuration name.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetVMPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -669,14 +669,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesSender sends the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -688,10 +688,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 }
 
 // listVirtualMachineScaleSetVMPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -699,17 +699,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddres
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/routefilterrules.go b/services/network/mgmt/2017-03-01/network/routefilterrulesgroup.go
similarity index 72%
rename from services/network/mgmt/2017-03-01/network/routefilterrules.go
rename to services/network/mgmt/2017-03-01/network/routefilterrulesgroup.go
index 8da7af1b440d..4f890795be47 100644
--- a/services/network/mgmt/2017-03-01/network/routefilterrules.go
+++ b/services/network/mgmt/2017-03-01/network/routefilterrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// RouteFilterRulesClient is the network Client
-type RouteFilterRulesClient struct {
+// RouteFilterRulesGroupClient is the network Client
+type RouteFilterRulesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFilterRulesClient creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClient(subscriptionID string) RouteFilterRulesClient {
-	return NewRouteFilterRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFilterRulesGroupClient creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClient(subscriptionID string) RouteFilterRulesGroupClient {
+	return NewRouteFilterRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFilterRulesClientWithBaseURI creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesClient {
-	return RouteFilterRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFilterRulesGroupClientWithBaseURI creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesGroupClient {
+	return RouteFilterRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route filter.
@@ -45,25 +45,25 @@ func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the create or update
 // route filter rule operation.
-func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: routeFilterRuleParameters,
 			Constraints: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.RouteFilterRuleType", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.Communities", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.RouteFilterRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.RouteFilterRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourc
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -96,7 +96,7 @@ func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (fu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupNa
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -166,7 +166,7 @@ func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourc
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) DeleteSender(req *http.Request) (future RouteFilterRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future Rou
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFilterRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (resul
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -241,14 +241,14 @@ func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGr
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -262,31 +262,31 @@ func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result R
 // ListByRouteFilter gets all RouteFilterRules in a route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFilterRulesClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
 	result.fn = client.listByRouteFilterNextResults
 	req, err := client.ListByRouteFilterPreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.rfrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure sending request")
 		return
 	}
 
 	result.rfrlr, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByRouteFilterPreparer prepares the ListByRouteFilter request.
-func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -308,14 +308,14 @@ func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Conte
 
 // ListByRouteFilterSender sends the ListByRouteFilter request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByRouteFilterResponder handles the response to the ListByRouteFilter request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -327,10 +327,10 @@ func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Respo
 }
 
 // listByRouteFilterNextResults retrieves the next set of results, if any.
-func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
 	req, err := lastResults.routeFilterRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -338,17 +338,17 @@ func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults Ro
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByRouteFilterComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
 	result.page, err = client.ListByRouteFilter(ctx, resourceGroupName, routeFilterName)
 	return
 }
@@ -358,16 +358,16 @@ func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Conte
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the update route
 // filter rule operation.
-func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -375,7 +375,7 @@ func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupNa
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -400,7 +400,7 @@ func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourc
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) UpdateSender(req *http.Request) (future RouteFilterRulesGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -415,7 +415,7 @@ func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future Rou
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-03-01/network/routefilters.go b/services/network/mgmt/2017-03-01/network/routefiltersgroup.go
similarity index 66%
rename from services/network/mgmt/2017-03-01/network/routefilters.go
rename to services/network/mgmt/2017-03-01/network/routefiltersgroup.go
index afdbf2699ffb..d9a8831bb1b5 100644
--- a/services/network/mgmt/2017-03-01/network/routefilters.go
+++ b/services/network/mgmt/2017-03-01/network/routefiltersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteFiltersClient is the network Client
-type RouteFiltersClient struct {
+// RouteFiltersGroupClient is the network Client
+type RouteFiltersGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFiltersClient creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
-	return NewRouteFiltersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFiltersGroupClient creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClient(subscriptionID string) RouteFiltersGroupClient {
+	return NewRouteFiltersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFiltersClientWithBaseURI creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
-	return RouteFiltersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFiltersGroupClientWithBaseURI creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersGroupClient {
+	return RouteFiltersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route filter in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the create or update route filter operation.
-func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGro
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -84,7 +84,7 @@ func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, res
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (r
 // Delete deletes the specified route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName s
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -152,7 +152,7 @@ func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGro
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) DeleteSender(req *http.Request) (future RouteFiltersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFiltersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result au
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. expand is
 // expands referenced express route bgp peering resources.
-func (client RouteFiltersClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -229,14 +229,14 @@ func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupN
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -248,31 +248,31 @@ func (client RouteFiltersClient) GetResponder(resp *http.Response) (result Route
 }
 
 // List gets all route filters in a subscription.
-func (client RouteFiltersClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -292,14 +292,14 @@ func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Reques
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -311,10 +311,10 @@ func (client RouteFiltersClient) ListResponder(resp *http.Response) (result Rout
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -322,17 +322,17 @@ func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResu
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
@@ -340,31 +340,31 @@ func (client RouteFiltersClient) ListComplete(ctx context.Context) (result Route
 // ListByResourceGroup gets all route filters in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteFiltersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listByResourceGroupNextResults
 	req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByResourceGroupPreparer prepares the ListByResourceGroup request.
-func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -385,14 +385,14 @@ func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context
 
 // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Respons
 }
 
 // listByResourceGroupNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults Rout
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.ListByResourceGroup(ctx, resourceGroupName)
 	return
 }
@@ -434,16 +434,16 @@ func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the update route filter operation.
-func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName s
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -475,7 +475,7 @@ func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGro
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) UpdateSender(req *http.Request) (future RouteFiltersGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFi
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-03-01/network/routes.go b/services/network/mgmt/2017-03-01/network/routesgroup.go
similarity index 69%
rename from services/network/mgmt/2017-03-01/network/routes.go
rename to services/network/mgmt/2017-03-01/network/routesgroup.go
index 42976ab3e525..3ad4c43baf74 100644
--- a/services/network/mgmt/2017-03-01/network/routes.go
+++ b/services/network/mgmt/2017-03-01/network/routesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RoutesClient is the network Client
-type RoutesClient struct {
+// RoutesGroupClient is the network Client
+type RoutesGroupClient struct {
 	BaseClient
 }
 
-// NewRoutesClient creates an instance of the RoutesClient client.
-func NewRoutesClient(subscriptionID string) RoutesClient {
-	return NewRoutesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRoutesGroupClient creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClient(subscriptionID string) RoutesGroupClient {
+	return NewRoutesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRoutesClientWithBaseURI creates an instance of the RoutesClient client.
-func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
-	return RoutesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRoutesGroupClientWithBaseURI creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClientWithBaseURI(baseURI string, subscriptionID string) RoutesGroupClient {
+	return RoutesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route. routeParameters is parameters supplied to the create or update route operation.
-func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, routeName, routeParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
+func (client RoutesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -85,7 +85,7 @@ func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceG
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdateSender(req *http.Request) (future RoutesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -100,7 +100,7 @@ func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future Route
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -115,16 +115,16 @@ func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -132,7 +132,7 @@ func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -155,7 +155,7 @@ func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) DeleteSender(req *http.Request) (future RoutesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -170,7 +170,7 @@ func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteF
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RoutesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -184,30 +184,30 @@ func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
+func (client RoutesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -230,14 +230,14 @@ func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName st
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) GetResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err
 // List gets all routes in a route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RoutesClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
+func (client RoutesGroupClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RoutesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -297,14 +297,14 @@ func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName s
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
+func (client RoutesGroupClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -316,10 +316,10 @@ func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListR
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RoutesClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
+func (client RoutesGroupClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
 	req, err := lastResults.routeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -327,17 +327,17 @@ func (client RoutesClient) listNextResults(lastResults RouteListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RoutesClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
+func (client RoutesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, routeTableName)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/routetables.go b/services/network/mgmt/2017-03-01/network/routetablesgroup.go
similarity index 65%
rename from services/network/mgmt/2017-03-01/network/routetables.go
rename to services/network/mgmt/2017-03-01/network/routetablesgroup.go
index 85b8de37ddb7..9c7c2c1678c9 100644
--- a/services/network/mgmt/2017-03-01/network/routetables.go
+++ b/services/network/mgmt/2017-03-01/network/routetablesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteTablesClient is the network Client
-type RouteTablesClient struct {
+// RouteTablesGroupClient is the network Client
+type RouteTablesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteTablesClient creates an instance of the RouteTablesClient client.
-func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
-	return NewRouteTablesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteTablesGroupClient creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClient(subscriptionID string) RouteTablesGroupClient {
+	return NewRouteTablesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteTablesClientWithBaseURI creates an instance of the RouteTablesClient client.
-func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
-	return RouteTablesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteTablesGroupClientWithBaseURI creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesGroupClient {
+	return RouteTablesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate create or updates a route table in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters
 // is parameters supplied to the create or update route table operation.
-func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGrou
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
+func (client RouteTablesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -84,7 +84,7 @@ func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, reso
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (re
 // Delete deletes the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName st
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -152,7 +152,7 @@ func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGrou
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) DeleteSender(req *http.Request) (future RouteTablesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTab
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteTablesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result aut
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. expand is
 // expands referenced resources.
-func (client RouteTablesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
+func (client RouteTablesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -229,14 +229,14 @@ func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupNa
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteT
 // List gets all route tables in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteTablesClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupN
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client RouteTablesClient) ListResponder(resp *http.Response) (result Route
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all route tables in a subscription.
-func (client RouteTablesClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Requ
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result Ro
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListRes
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/securitygroups.go b/services/network/mgmt/2017-03-01/network/securitygroupsgroup.go
similarity index 65%
rename from services/network/mgmt/2017-03-01/network/securitygroups.go
rename to services/network/mgmt/2017-03-01/network/securitygroupsgroup.go
index 62cc185adcea..83e52e3a59d7 100644
--- a/services/network/mgmt/2017-03-01/network/securitygroups.go
+++ b/services/network/mgmt/2017-03-01/network/securitygroupsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// SecurityGroupsClient is the network Client
-type SecurityGroupsClient struct {
+// SecurityGroupsGroupClient is the network Client
+type SecurityGroupsGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityGroupsClient creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
-	return NewSecurityGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityGroupsGroupClient creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClient(subscriptionID string) SecurityGroupsGroupClient {
+	return NewSecurityGroupsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityGroupsClientWithBaseURI creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
-	return SecurityGroupsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityGroupsGroupClientWithBaseURI creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsGroupClient {
+	return SecurityGroupsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network security group in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. parameters is parameters supplied to the create or update network security group operation.
-func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceG
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (futu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -114,16 +114,16 @@ func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -131,7 +131,7 @@ func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -153,7 +153,7 @@ func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) DeleteSender(req *http.Request) (future SecurityGroupsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -168,7 +168,7 @@ func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future Secur
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityGroupsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -182,30 +182,30 @@ func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. expand is expands referenced resources.
-func (client SecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -230,14 +230,14 @@ func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result Sec
 // List gets all network security groups in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client SecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -296,14 +296,14 @@ func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -315,10 +315,10 @@ func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result Se
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -326,47 +326,47 @@ func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupList
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network security groups in a subscription.
-func (client SecurityGroupsClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -386,14 +386,14 @@ func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.R
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -405,10 +405,10 @@ func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -416,17 +416,17 @@ func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupL
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/securityrules.go b/services/network/mgmt/2017-03-01/network/securityrulesgroup.go
similarity index 68%
rename from services/network/mgmt/2017-03-01/network/securityrules.go
rename to services/network/mgmt/2017-03-01/network/securityrulesgroup.go
index e22562c13ad9..bdac77f6ec03 100644
--- a/services/network/mgmt/2017-03-01/network/securityrules.go
+++ b/services/network/mgmt/2017-03-01/network/securityrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// SecurityRulesClient is the network Client
-type SecurityRulesClient struct {
+// SecurityRulesGroupClient is the network Client
+type SecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityRulesClient creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
-	return NewSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityRulesGroupClient creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClient(subscriptionID string) SecurityRulesGroupClient {
+	return NewSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityRulesClientWithBaseURI creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
-	return SecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityRulesGroupClientWithBaseURI creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesGroupClient {
+	return SecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a security rule in the specified network security group.
@@ -45,25 +45,25 @@ func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) Se
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule. securityRuleParameters is parameters supplied
 // to the create or update network security rule operation.
-func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: securityRuleParameters,
 			Constraints: []validation.Constraint{{Target: "securityRuleParameters.SecurityRulePropertiesFormat", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "securityRuleParameters.SecurityRulePropertiesFormat.SourceAddressPrefix", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "securityRuleParameters.SecurityRulePropertiesFormat.DestinationAddressPrefix", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.SecurityRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.SecurityRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
+func (client SecurityRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -96,7 +96,7 @@ func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -166,7 +166,7 @@ func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) DeleteSender(req *http.Request) (future SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) DeleteSender(req *http.Request) (future SecurityRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client SecurityRulesClient) DeleteSender(req *http.Request) (future Securi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -241,14 +241,14 @@ func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -263,31 +263,31 @@ func (client SecurityRulesClient) GetResponder(resp *http.Response) (result Secu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client SecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -309,14 +309,14 @@ func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -328,10 +328,10 @@ func (client SecurityRulesClient) ListResponder(resp *http.Response) (result Sec
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -339,17 +339,17 @@ func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client SecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/subnets.go b/services/network/mgmt/2017-03-01/network/subnetsgroup.go
similarity index 69%
rename from services/network/mgmt/2017-03-01/network/subnets.go
rename to services/network/mgmt/2017-03-01/network/subnetsgroup.go
index 4cc140b6c981..bb4ba381ef42 100644
--- a/services/network/mgmt/2017-03-01/network/subnets.go
+++ b/services/network/mgmt/2017-03-01/network/subnetsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SubnetsClient is the network Client
-type SubnetsClient struct {
+// SubnetsGroupClient is the network Client
+type SubnetsGroupClient struct {
 	BaseClient
 }
 
-// NewSubnetsClient creates an instance of the SubnetsClient client.
-func NewSubnetsClient(subscriptionID string) SubnetsClient {
-	return NewSubnetsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSubnetsGroupClient creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClient(subscriptionID string) SubnetsGroupClient {
+	return NewSubnetsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSubnetsClientWithBaseURI creates an instance of the SubnetsClient client.
-func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
-	return SubnetsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSubnetsGroupClientWithBaseURI creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClientWithBaseURI(baseURI string, subscriptionID string) SubnetsGroupClient {
+	return SubnetsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a subnet in the specified virtual network.
@@ -44,16 +44,16 @@ func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsC
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. subnetParameters is parameters supplied to the create or update subnet
 // operation.
-func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, subnetParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupNam
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
+func (client SubnetsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -86,7 +86,7 @@ func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resource
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateSender(req *http.Request) (future SubnetsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future Subn
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet.
-func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
+func (client SubnetsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -156,7 +156,7 @@ func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupNam
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) DeleteSender(req *http.Request) (future SubnetsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDelet
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SubnetsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autores
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. expand is expands referenced resources.
-func (client SubnetsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
+func (client SubnetsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
+func (client SubnetsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -234,14 +234,14 @@ func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName s
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) GetResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -255,31 +255,31 @@ func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, er
 // List gets all subnets in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client SubnetsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
+func (client SubnetsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.slr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.slr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client SubnetsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -301,14 +301,14 @@ func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,10 +320,10 @@ func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetLis
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
 	req, err := lastResults.subnetListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -331,17 +331,17 @@ func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (resul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SubnetsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
+func (client SubnetsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/usages.go b/services/network/mgmt/2017-03-01/network/usagesgroup.go
similarity index 64%
rename from services/network/mgmt/2017-03-01/network/usages.go
rename to services/network/mgmt/2017-03-01/network/usagesgroup.go
index 26331f7a64ee..daf647f3e13c 100644
--- a/services/network/mgmt/2017-03-01/network/usages.go
+++ b/services/network/mgmt/2017-03-01/network/usagesgroup.go
@@ -25,55 +25,55 @@ import (
 	"net/http"
 )
 
-// UsagesClient is the network Client
-type UsagesClient struct {
+// UsagesGroupClient is the network Client
+type UsagesGroupClient struct {
 	BaseClient
 }
 
-// NewUsagesClient creates an instance of the UsagesClient client.
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return NewUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewUsagesGroupClient creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClient(subscriptionID string) UsagesGroupClient {
+	return NewUsagesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewUsagesClientWithBaseURI creates an instance of the UsagesClient client.
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return UsagesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewUsagesGroupClientWithBaseURI creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClientWithBaseURI(baseURI string, subscriptionID string) UsagesGroupClient {
+	return UsagesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List lists compute usages for a subscription.
 //
 // location is the location where resource usage is queried.
-func (client UsagesClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
+func (client UsagesGroupClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: location,
 			Constraints: []validation.Constraint{{Target: "location", Name: validation.Pattern, Rule: `^[-\w\._]+$`, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.UsagesClient", "List", err.Error())
+		return result, validation.NewError("network.UsagesGroupClient", "List", err.Error())
 	}
 
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ulr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ulr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client UsagesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -94,14 +94,14 @@ func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client UsagesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client UsagesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,10 +113,10 @@ func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesList
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
 	req, err := lastResults.usagesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -124,17 +124,17 @@ func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client UsagesClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
+func (client UsagesGroupClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/version.go b/services/network/mgmt/2017-03-01/network/version.go
index cfe38a16050d..63850a4b2460 100644
--- a/services/network/mgmt/2017-03-01/network/version.go
+++ b/services/network/mgmt/2017-03-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2017-03-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2017-03-01/network/virtualnetworkgatewayconnections.go b/services/network/mgmt/2017-03-01/network/virtualnetworkgatewayconnectionsgroup.go
similarity index 71%
rename from services/network/mgmt/2017-03-01/network/virtualnetworkgatewayconnections.go
rename to services/network/mgmt/2017-03-01/network/virtualnetworkgatewayconnectionsgroup.go
index 2068c3ccebac..25d10156e186 100644
--- a/services/network/mgmt/2017-03-01/network/virtualnetworkgatewayconnections.go
+++ b/services/network/mgmt/2017-03-01/network/virtualnetworkgatewayconnectionsgroup.go
@@ -25,20 +25,21 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewayConnectionsClient is the network Client
-type VirtualNetworkGatewayConnectionsClient struct {
+// VirtualNetworkGatewayConnectionsGroupClient is the network Client
+type VirtualNetworkGatewayConnectionsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewayConnectionsClient creates an instance of the VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return NewVirtualNetworkGatewayConnectionsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewayConnectionsGroupClient creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClient(subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewayConnectionsClientWithBaseURI creates an instance of the
-// VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return VirtualNetworkGatewayConnectionsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return VirtualNetworkGatewayConnectionsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway connection in the specified resource group.
@@ -46,7 +47,7 @@ func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscr
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection. parameters is parameters supplied to the create or update virtual network
 // gateway connection operation.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat", Name: validation.Null, Rule: true,
@@ -57,18 +58,18 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 					{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2", Name: validation.Null, Rule: false,
 						Chain: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -76,7 +77,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -100,7 +101,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -115,7 +116,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *h
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -130,16 +131,16 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -147,7 +148,7 @@ func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -169,7 +170,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +185,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Requ
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -198,30 +199,30 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -243,14 +244,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Con
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -266,30 +267,30 @@ func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection shared key name.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
 	req, err := client.GetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSharedKeySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSharedKeyPreparer prepares the GetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -311,14 +312,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx co
 
 // GetSharedKeySender sends the GetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSharedKeyResponder handles the response to the GetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,31 +334,31 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp
 // created.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewayConnectionsClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vngclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vngclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -378,14 +379,14 @@ func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Co
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -397,10 +398,10 @@ func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayConnectionListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -408,17 +409,17 @@ func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -430,25 +431,25 @@ func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Co
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection reset shared key Name. parameters is parameters supplied to the begin reset virtual network
 // gateway connection shared key operation through network resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.InclusiveMaximum, Rule: 128, Chain: nil},
 					{Target: "parameters.KeyLength", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", err.Error())
 	}
 
 	req, err := client.ResetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -456,7 +457,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.
 }
 
 // ResetSharedKeyPreparer prepares the ResetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -480,7 +481,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx
 
 // ResetSharedKeySender sends the ResetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -495,7 +496,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *h
 
 // ResetSharedKeyResponder handles the response to the ResetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -513,22 +514,22 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection name. parameters is parameters supplied to the Begin Set Virtual Network Gateway connection
 // Shared key operation throughNetwork resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Value", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", err.Error())
 	}
 
 	req, err := client.SetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -536,7 +537,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Co
 }
 
 // SetSharedKeyPreparer prepares the SetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -560,7 +561,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx co
 
 // SetSharedKeySender sends the SetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -575,7 +576,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *htt
 
 // SetSharedKeyResponder handles the response to the SetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-03-01/network/virtualnetworkgateways.go b/services/network/mgmt/2017-03-01/network/virtualnetworkgatewaysgroup.go
similarity index 73%
rename from services/network/mgmt/2017-03-01/network/virtualnetworkgateways.go
rename to services/network/mgmt/2017-03-01/network/virtualnetworkgatewaysgroup.go
index 2f14006ea954..c11ada53447e 100644
--- a/services/network/mgmt/2017-03-01/network/virtualnetworkgateways.go
+++ b/services/network/mgmt/2017-03-01/network/virtualnetworkgatewaysgroup.go
@@ -25,41 +25,41 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewaysClient is the network Client
-type VirtualNetworkGatewaysClient struct {
+// VirtualNetworkGatewaysGroupClient is the network Client
+type VirtualNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewaysClient creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClient(subscriptionID string) VirtualNetworkGatewaysClient {
-	return NewVirtualNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewaysGroupClient creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClient(subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return NewVirtualNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewaysClientWithBaseURI creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysClient {
-	return VirtualNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewaysGroupClientWithBaseURI creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return VirtualNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to create or update virtual network gateway operation.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -67,7 +67,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -91,7 +91,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -106,7 +106,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -121,16 +121,16 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -138,7 +138,7 @@ func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -160,7 +160,7 @@ func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -175,7 +175,7 @@ func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -191,30 +191,30 @@ func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response)
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result String, err error) {
 	req, err := client.GeneratevpnclientpackagePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GeneratevpnclientpackageSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GeneratevpnclientpackageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GeneratevpnclientpackagePreparer prepares the Generatevpnclientpackage request.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -238,14 +238,14 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx
 
 // GeneratevpnclientpackageSender sends the Generatevpnclientpackage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GeneratevpnclientpackageResponder handles the response to the Generatevpnclientpackage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -260,30 +260,30 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -305,14 +305,14 @@ func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -328,16 +328,16 @@ func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	req, err := client.GetAdvertisedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetAdvertisedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -345,7 +345,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Conte
 }
 
 // GetAdvertisedRoutesPreparer prepares the GetAdvertisedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -368,7 +368,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx conte
 
 // GetAdvertisedRoutesSender sends the GetAdvertisedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -383,7 +383,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.R
 
 // GetAdvertisedRoutesResponder handles the response to the GetAdvertisedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -398,16 +398,16 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer to retrieve the status of.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	req, err := client.GetBgpPeerStatusPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetBgpPeerStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -415,7 +415,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context,
 }
 
 // GetBgpPeerStatusPreparer prepares the GetBgpPeerStatus request.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -440,7 +440,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.
 
 // GetBgpPeerStatusSender sends the GetBgpPeerStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -455,7 +455,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Requ
 
 // GetBgpPeerStatusResponder handles the response to the GetBgpPeerStatus request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -471,16 +471,16 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	req, err := client.GetLearnedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetLearnedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -488,7 +488,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context,
 }
 
 // GetLearnedRoutesPreparer prepares the GetLearnedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -510,7 +510,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.
 
 // GetLearnedRoutesSender sends the GetLearnedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -525,7 +525,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Requ
 
 // GetLearnedRoutesResponder handles the response to the GetLearnedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -539,31 +539,31 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.
 // List gets all virtual network gateways by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -584,14 +584,14 @@ func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -603,10 +603,10 @@ func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -614,17 +614,17 @@ func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -634,16 +634,16 @@ func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. gatewayVip is virtual network gateway vip address supplied to the begin reset of the
 // active-active feature enabled gateway.
-func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysGroupResetFuture, err error) {
 	req, err := client.ResetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, gatewayVip)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -651,7 +651,7 @@ func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGr
 }
 
 // ResetPreparer prepares the Reset request.
-func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -676,7 +676,7 @@ func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, re
 
 // ResetSender sends the Reset request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysGroupResetFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -691,7 +691,7 @@ func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (futur
 
 // ResetResponder handles the response to the Reset request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-03-01/network/virtualnetworkpeerings.go b/services/network/mgmt/2017-03-01/network/virtualnetworkpeeringsgroup.go
similarity index 70%
rename from services/network/mgmt/2017-03-01/network/virtualnetworkpeerings.go
rename to services/network/mgmt/2017-03-01/network/virtualnetworkpeeringsgroup.go
index 2b066948f047..a36e7d224930 100644
--- a/services/network/mgmt/2017-03-01/network/virtualnetworkpeerings.go
+++ b/services/network/mgmt/2017-03-01/network/virtualnetworkpeeringsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkPeeringsClient is the network Client
-type VirtualNetworkPeeringsClient struct {
+// VirtualNetworkPeeringsGroupClient is the network Client
+type VirtualNetworkPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkPeeringsClient creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
-	return NewVirtualNetworkPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkPeeringsGroupClient creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClient(subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return NewVirtualNetworkPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkPeeringsClientWithBaseURI creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
-	return VirtualNetworkPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkPeeringsGroupClientWithBaseURI creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return VirtualNetworkPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified virtual network.
@@ -44,16 +44,16 @@ func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID s
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the peering. virtualNetworkPeeringParameters is parameters supplied to
 // the create or update virtual network peering operation.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -86,7 +86,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -156,7 +156,7 @@ func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -231,14 +231,14 @@ func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +252,31 @@ func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (re
 // List gets all virtual network peerings in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworkPeeringsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
+func (client VirtualNetworkPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -298,14 +298,14 @@ func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +317,10 @@ func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
 	req, err := lastResults.virtualNetworkPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +328,17 @@ func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/virtualnetworks.go b/services/network/mgmt/2017-03-01/network/virtualnetworksgroup.go
similarity index 70%
rename from services/network/mgmt/2017-03-01/network/virtualnetworks.go
rename to services/network/mgmt/2017-03-01/network/virtualnetworksgroup.go
index 5fc8c8ecc230..a8ba7e559a03 100644
--- a/services/network/mgmt/2017-03-01/network/virtualnetworks.go
+++ b/services/network/mgmt/2017-03-01/network/virtualnetworksgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// VirtualNetworksClient is the network Client
-type VirtualNetworksClient struct {
+// VirtualNetworksGroupClient is the network Client
+type VirtualNetworksGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworksClient creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return NewVirtualNetworksClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworksGroupClient creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClient(subscriptionID string) VirtualNetworksGroupClient {
+	return NewVirtualNetworksGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworksClientWithBaseURI creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return VirtualNetworksClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworksGroupClientWithBaseURI creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksGroupClient {
+	return VirtualNetworksGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckIPAddressAvailability checks whether a private IP address is available for use.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // IPAddress is the private IP address to be verified.
-func (client VirtualNetworksClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
 	req, err := client.CheckIPAddressAvailabilityPreparer(ctx, resourceGroupName, virtualNetworkName, IPAddress)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CheckIPAddressAvailabilitySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CheckIPAddressAvailabilityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CheckIPAddressAvailabilityPreparer prepares the CheckIPAddressAvailability request.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -91,14 +91,14 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx conte
 
 // CheckIPAddressAvailabilitySender sends the CheckIPAddressAvailability request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CheckIPAddressAvailabilityResponder handles the response to the CheckIPAddressAvailability request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // parameters is parameters supplied to the create or update virtual network operation
-func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -154,7 +154,7 @@ func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -169,7 +169,7 @@ func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -183,16 +183,16 @@ func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response)
 // Delete deletes the specified virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -200,7 +200,7 @@ func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -222,7 +222,7 @@ func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) DeleteSender(req *http.Request) (future VirtualNetworksGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -237,7 +237,7 @@ func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future Virt
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworksGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,30 +251,30 @@ func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // expand is expands referenced resources.
-func (client VirtualNetworksClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -299,14 +299,14 @@ func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,31 +320,31 @@ func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result Vi
 // List gets all virtual networks in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworksClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -365,14 +365,14 @@ func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -384,10 +384,10 @@ func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result V
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -395,47 +395,47 @@ func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all virtual networks in a subscription.
-func (client VirtualNetworksClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -455,14 +455,14 @@ func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -474,10 +474,10 @@ func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (resul
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -485,17 +485,17 @@ func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetwor
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -503,31 +503,31 @@ func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result
 // ListUsage lists usage stats.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
 	result.fn = client.listUsageNextResults
 	req, err := client.ListUsagePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.vnlur.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlur, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListUsagePreparer prepares the ListUsage request.
-func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -549,14 +549,14 @@ func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resou
 
 // ListUsageSender sends the ListUsage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListUsageSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListUsageSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListUsageResponder handles the response to the ListUsage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -568,10 +568,10 @@ func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (res
 }
 
 // listUsageNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
 	req, err := lastResults.virtualNetworkListUsageResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -579,17 +579,17 @@ func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetw
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListUsageComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
 	result.page, err = client.ListUsage(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-03-01/network/watchers.go b/services/network/mgmt/2017-03-01/network/watchersgroup.go
similarity index 71%
rename from services/network/mgmt/2017-03-01/network/watchers.go
rename to services/network/mgmt/2017-03-01/network/watchersgroup.go
index 708b87d71164..c8bb9420188e 100644
--- a/services/network/mgmt/2017-03-01/network/watchers.go
+++ b/services/network/mgmt/2017-03-01/network/watchersgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// WatchersClient is the network Client
-type WatchersClient struct {
+// WatchersGroupClient is the network Client
+type WatchersGroupClient struct {
 	BaseClient
 }
 
-// NewWatchersClient creates an instance of the WatchersClient client.
-func NewWatchersClient(subscriptionID string) WatchersClient {
-	return NewWatchersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewWatchersGroupClient creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClient(subscriptionID string) WatchersGroupClient {
+	return NewWatchersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewWatchersClientWithBaseURI creates an instance of the WatchersClient client.
-func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) WatchersClient {
-	return WatchersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewWatchersGroupClientWithBaseURI creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClientWithBaseURI(baseURI string, subscriptionID string) WatchersGroupClient {
+	return WatchersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckConnectivity verifies the possibility of establishing a direct TCP connection from a virtual machine to a given
@@ -45,24 +45,24 @@ func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) Watcher
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that determine how the connectivity check will be performed.
-func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersGroupCheckConnectivityFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.Source.ResourceID", Name: validation.Null, Rule: true, Chain: nil}}},
 				{Target: "parameters.Destination", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "CheckConnectivity", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "CheckConnectivity", err.Error())
 	}
 
 	req, err := client.CheckConnectivityPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CheckConnectivitySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -70,7 +70,7 @@ func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGrou
 }
 
 // CheckConnectivityPreparer prepares the CheckConnectivity request.
-func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
+func (client WatchersGroupClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -94,7 +94,7 @@ func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, reso
 
 // CheckConnectivitySender sends the CheckConnectivity request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivitySender(req *http.Request) (future WatchersGroupCheckConnectivityFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -109,7 +109,7 @@ func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future
 
 // CheckConnectivityResponder handles the response to the CheckConnectivity request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
+func (client WatchersGroupClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -124,30 +124,30 @@ func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the network watcher resource.
-func (client WatchersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CreateOrUpdateSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
+func (client WatchersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -171,14 +171,14 @@ func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourc
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -192,16 +192,16 @@ func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (resul
 // Delete deletes the specified network watcher resource.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -209,7 +209,7 @@ func (client WatchersClient) Delete(ctx context.Context, resourceGroupName strin
 }
 
 // DeletePreparer prepares the Delete request.
-func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -231,7 +231,7 @@ func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupNa
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) DeleteSender(req *http.Request) (future WatchersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -246,7 +246,7 @@ func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDel
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client WatchersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -259,30 +259,30 @@ func (client WatchersClient) DeleteResponder(resp *http.Response) (result autore
 // Get gets the specified network watcher by resource group.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
+func (client WatchersGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -304,14 +304,14 @@ func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) GetResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -326,22 +326,22 @@ func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher,
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define a resource to query flow log status.
-func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGroupGetFlowLogStatusFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetFlowLogStatus", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetFlowLogStatus", err.Error())
 	}
 
 	req, err := client.GetFlowLogStatusPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetFlowLogStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -349,7 +349,7 @@ func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroup
 }
 
 // GetFlowLogStatusPreparer prepares the GetFlowLogStatus request.
-func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -373,7 +373,7 @@ func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resou
 
 // GetFlowLogStatusSender sends the GetFlowLogStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGroupGetFlowLogStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -388,7 +388,7 @@ func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future W
 
 // GetFlowLogStatusResponder handles the response to the GetFlowLogStatus request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -403,24 +403,24 @@ func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the source and destination endpoint.
-func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGroupGetNextHopFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.SourceIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.DestinationIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetNextHop", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetNextHop", err.Error())
 	}
 
 	req, err := client.GetNextHopPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetNextHopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -428,7 +428,7 @@ func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName s
 }
 
 // GetNextHopPreparer prepares the GetNextHop request.
-func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -452,7 +452,7 @@ func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGro
 
 // GetNextHopSender sends the GetNextHop request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetNextHopSender(req *http.Request) (future WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHopSender(req *http.Request) (future WatchersGroupGetNextHopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -467,7 +467,7 @@ func (client WatchersClient) GetNextHopSender(req *http.Request) (future Watcher
 
 // GetNextHopResponder handles the response to the GetNextHop request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
+func (client WatchersGroupClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -482,36 +482,36 @@ func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result Ne
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the representation of topology.
-func (client WatchersClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceGroupName", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTopology", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTopology", err.Error())
 	}
 
 	req, err := client.GetTopologyPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetTopologySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetTopologyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetTopologyPreparer prepares the GetTopology request.
-func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -535,14 +535,14 @@ func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGr
 
 // GetTopologySender sends the GetTopology request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTopologySender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetTopologySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetTopologyResponder handles the response to the GetTopology request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -557,7 +557,7 @@ func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result T
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to troubleshoot.
-func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGroupGetTroubleshootingFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -565,18 +565,18 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 					Chain: []validation.Constraint{{Target: "parameters.TroubleshootingProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.TroubleshootingProperties.StoragePath", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshooting", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshooting", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -584,7 +584,7 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 }
 
 // GetTroubleshootingPreparer prepares the GetTroubleshooting request.
-func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -608,7 +608,7 @@ func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, res
 
 // GetTroubleshootingSender sends the GetTroubleshooting request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingSender(req *http.Request) (future WatchersGroupGetTroubleshootingFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -623,7 +623,7 @@ func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future
 
 // GetTroubleshootingResponder handles the response to the GetTroubleshooting request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -638,22 +638,22 @@ func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to query the troubleshooting result.
-func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGroupGetTroubleshootingResultFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshootingResult", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshootingResult", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingResultPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingResultSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -661,7 +661,7 @@ func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resou
 }
 
 // GetTroubleshootingResultPreparer prepares the GetTroubleshootingResult request.
-func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -685,7 +685,7 @@ func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Contex
 
 // GetTroubleshootingResultSender sends the GetTroubleshootingResult request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGroupGetTroubleshootingResultFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -700,7 +700,7 @@ func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (
 
 // GetTroubleshootingResultResponder handles the response to the GetTroubleshootingResult request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -715,22 +715,22 @@ func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the VM to check security groups for.
-func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGroupGetVMSecurityRulesFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetVMSecurityRules", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetVMSecurityRules", err.Error())
 	}
 
 	req, err := client.GetVMSecurityRulesPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVMSecurityRulesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -738,7 +738,7 @@ func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGro
 }
 
 // GetVMSecurityRulesPreparer prepares the GetVMSecurityRules request.
-func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -762,7 +762,7 @@ func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, res
 
 // GetVMSecurityRulesSender sends the GetVMSecurityRules request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGroupGetVMSecurityRulesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -777,7 +777,7 @@ func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future
 
 // GetVMSecurityRulesResponder handles the response to the GetVMSecurityRules request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -791,30 +791,30 @@ func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (r
 // List gets all network watchers by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client WatchersClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client WatchersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -835,14 +835,14 @@ func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -854,30 +854,30 @@ func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherL
 }
 
 // ListAll gets all network watchers by subscription.
-func (client WatchersClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client WatchersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -897,14 +897,14 @@ func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -919,7 +919,7 @@ func (client WatchersClient) ListAllResponder(resp *http.Response) (result Watch
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define the configuration of flow log.
-func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -927,18 +927,18 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 					Chain: []validation.Constraint{{Target: "parameters.FlowLogProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.FlowLogProperties.Enabled", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "SetFlowLogConfiguration", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "SetFlowLogConfiguration", err.Error())
 	}
 
 	req, err := client.SetFlowLogConfigurationPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetFlowLogConfigurationSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -946,7 +946,7 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 }
 
 // SetFlowLogConfigurationPreparer prepares the SetFlowLogConfiguration request.
-func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -970,7 +970,7 @@ func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context
 
 // SetFlowLogConfigurationSender sends the SetFlowLogConfiguration request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -985,7 +985,7 @@ func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (f
 
 // SetFlowLogConfigurationResponder handles the response to the SetFlowLogConfiguration request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1000,7 +1000,7 @@ func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Respons
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the IP flow to be verified.
-func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersGroupVerifyIPFlowFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -1008,18 +1008,18 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 				{Target: "parameters.RemotePort", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.LocalIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.RemoteIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "VerifyIPFlow", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "VerifyIPFlow", err.Error())
 	}
 
 	req, err := client.VerifyIPFlowPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.VerifyIPFlowSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1027,7 +1027,7 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 }
 
 // VerifyIPFlowPreparer prepares the VerifyIPFlow request.
-func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
+func (client WatchersGroupClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1051,7 +1051,7 @@ func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceG
 
 // VerifyIPFlowSender sends the VerifyIPFlow request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlowSender(req *http.Request) (future WatchersGroupVerifyIPFlowFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1066,7 +1066,7 @@ func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future Watch
 
 // VerifyIPFlowResponder handles the response to the VerifyIPFlow request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
+func (client WatchersGroupClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-06-01/network/applicationgateways.go b/services/network/mgmt/2017-06-01/network/applicationgatewaysgroup.go
similarity index 70%
rename from services/network/mgmt/2017-06-01/network/applicationgateways.go
rename to services/network/mgmt/2017-06-01/network/applicationgatewaysgroup.go
index 9485d13e41e7..b3ba4b03db26 100644
--- a/services/network/mgmt/2017-06-01/network/applicationgateways.go
+++ b/services/network/mgmt/2017-06-01/network/applicationgatewaysgroup.go
@@ -25,35 +25,35 @@ import (
 	"net/http"
 )
 
-// ApplicationGatewaysClient is the network Client
-type ApplicationGatewaysClient struct {
+// ApplicationGatewaysGroupClient is the network Client
+type ApplicationGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewApplicationGatewaysClient creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
-	return NewApplicationGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewApplicationGatewaysGroupClient creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClient(subscriptionID string) ApplicationGatewaysGroupClient {
+	return NewApplicationGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewApplicationGatewaysClientWithBaseURI creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
-	return ApplicationGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewApplicationGatewaysGroupClientWithBaseURI creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysGroupClient {
+	return ApplicationGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // BackendHealth gets the backend health of the specified application gateway in a resource group.
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. expand is expands BackendAddressPool and BackendHttpSettings referenced in backend health.
-func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	req, err := client.BackendHealthPreparer(ctx, resourceGroupName, applicationGatewayName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.BackendHealthSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resou
 }
 
 // BackendHealthPreparer prepares the BackendHealth request.
-func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Contex
 
 // BackendHealthSender sends the BackendHealth request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (
 
 // BackendHealthResponder handles the response to the BackendHealth request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,7 +116,7 @@ func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. parameters is parameters supplied to the create or update application gateway operation.
-func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ApplicationGatewayPropertiesFormat", Name: validation.Null, Rule: false,
@@ -126,18 +126,18 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 						{Target: "parameters.ApplicationGatewayPropertiesFormat.WebApplicationFirewallConfiguration.RuleSetVersion", Name: validation.Null, Rule: true, Chain: nil},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ApplicationGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ApplicationGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -145,7 +145,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -169,7 +169,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +184,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -199,16 +199,16 @@ func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -216,7 +216,7 @@ func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGrou
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -238,7 +238,7 @@ func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, reso
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteSender(req *http.Request) (future ApplicationGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -253,7 +253,7 @@ func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -267,30 +267,30 @@ func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -312,14 +312,14 @@ func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourc
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (resul
 // GetSslPredefinedPolicy gets Ssl predefined policy with the specified policy name.
 //
 // predefinedPolicyName is name of Ssl predefined policy.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	req, err := client.GetSslPredefinedPolicyPreparer(ctx, predefinedPolicyName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSslPredefinedPolicySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSslPredefinedPolicyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSslPredefinedPolicyPreparer prepares the GetSslPredefinedPolicy request.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"predefinedPolicyName": autorest.Encode("path", predefinedPolicyName),
 		"subscriptionId":       autorest.Encode("path", client.SubscriptionID),
@@ -377,14 +377,14 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx conte
 
 // GetSslPredefinedPolicySender sends the GetSslPredefinedPolicy request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSslPredefinedPolicyResponder handles the response to the GetSslPredefinedPolicy request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -398,31 +398,31 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *ht
 // List lists all application gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ApplicationGatewaysClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -443,14 +443,14 @@ func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resour
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -462,10 +462,10 @@ func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (resu
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -473,47 +473,47 @@ func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationG
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the application gateways in a subscription.
-func (client ApplicationGatewaysClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -533,14 +533,14 @@ func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*h
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -552,10 +552,10 @@ func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (r
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -563,46 +563,46 @@ func (client ApplicationGatewaysClient) listAllNextResults(lastResults Applicati
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
 
 // ListAvailableSslOptions lists available Ssl options for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
 	req, err := client.ListAvailableSslOptionsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslOptionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableSslOptionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslOptionsPreparer prepares the ListAvailableSslOptions request.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -622,14 +622,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx cont
 
 // ListAvailableSslOptionsSender sends the ListAvailableSslOptions request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslOptionsResponder handles the response to the ListAvailableSslOptions request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -641,31 +641,31 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *h
 }
 
 // ListAvailableSslPredefinedPolicies lists all SSL predefined policies for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
 	result.fn = client.listAvailableSslPredefinedPoliciesNextResults
 	req, err := client.ListAvailableSslPredefinedPoliciesPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.agaspp.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
 		return
 	}
 
 	result.agaspp, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesPreparer prepares the ListAvailableSslPredefinedPolicies request.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -685,14 +685,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPrepar
 
 // ListAvailableSslPredefinedPoliciesSender sends the ListAvailableSslPredefinedPolicies request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslPredefinedPoliciesResponder handles the response to the ListAvailableSslPredefinedPolicies request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -704,10 +704,10 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesRespon
 }
 
 // listAvailableSslPredefinedPoliciesNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	req, err := lastResults.applicationGatewayAvailableSslPredefinedPoliciesPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -715,46 +715,46 @@ func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextRe
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
 	result.page, err = client.ListAvailableSslPredefinedPolicies(ctx)
 	return
 }
 
 // ListAvailableWafRuleSets lists all available web application firewall rule sets.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	req, err := client.ListAvailableWafRuleSetsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableWafRuleSetsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableWafRuleSetsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableWafRuleSetsPreparer prepares the ListAvailableWafRuleSets request.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -774,14 +774,14 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx con
 
 // ListAvailableWafRuleSetsSender sends the ListAvailableWafRuleSets request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableWafRuleSetsResponder handles the response to the ListAvailableWafRuleSets request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -796,16 +796,16 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStartFuture, err error) {
 	req, err := client.StartPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StartSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -813,7 +813,7 @@ func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroup
 }
 
 // StartPreparer prepares the Start request.
-func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -835,7 +835,7 @@ func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resou
 
 // StartSender sends the Start request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StartSender(req *http.Request) (future ApplicationGatewaysGroupStartFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -850,7 +850,7 @@ func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future A
 
 // StartResponder handles the response to the Start request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -864,16 +864,16 @@ func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -881,7 +881,7 @@ func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupN
 }
 
 // StopPreparer prepares the Stop request.
-func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -903,7 +903,7 @@ func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resour
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StopSender(req *http.Request) (future ApplicationGatewaysGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -918,7 +918,7 @@ func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future Ap
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-06-01/network/availableendpointservices.go b/services/network/mgmt/2017-06-01/network/availableendpointservicesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-06-01/network/availableendpointservices.go
rename to services/network/mgmt/2017-06-01/network/availableendpointservicesgroup.go
index bd2a8250a128..a5f6bc4b28b5 100644
--- a/services/network/mgmt/2017-06-01/network/availableendpointservices.go
+++ b/services/network/mgmt/2017-06-01/network/availableendpointservicesgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// AvailableEndpointServicesClient is the network Client
-type AvailableEndpointServicesClient struct {
+// AvailableEndpointServicesGroupClient is the network Client
+type AvailableEndpointServicesGroupClient struct {
 	BaseClient
 }
 
-// NewAvailableEndpointServicesClient creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClient(subscriptionID string) AvailableEndpointServicesClient {
-	return NewAvailableEndpointServicesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewAvailableEndpointServicesGroupClient creates an instance of the AvailableEndpointServicesGroupClient client.
+func NewAvailableEndpointServicesGroupClient(subscriptionID string) AvailableEndpointServicesGroupClient {
+	return NewAvailableEndpointServicesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewAvailableEndpointServicesClientWithBaseURI creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesClient {
-	return AvailableEndpointServicesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewAvailableEndpointServicesGroupClientWithBaseURI creates an instance of the AvailableEndpointServicesGroupClient
+// client.
+func NewAvailableEndpointServicesGroupClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesGroupClient {
+	return AvailableEndpointServicesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list what values of endpoint services are available for use.
 //
 // location is the location to check available endpoint services.
-func (client AvailableEndpointServicesClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
+func (client AvailableEndpointServicesGroupClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.eslr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.eslr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client AvailableEndpointServicesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -87,14 +88,14 @@ func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client AvailableEndpointServicesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client AvailableEndpointServicesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -106,10 +107,10 @@ func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client AvailableEndpointServicesClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
 	req, err := lastResults.endpointServicesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -117,17 +118,17 @@ func (client AvailableEndpointServicesClient) listNextResults(lastResults Endpoi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client AvailableEndpointServicesClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
+func (client AvailableEndpointServicesGroupClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/bgpservicecommunities.go b/services/network/mgmt/2017-06-01/network/bgpservicecommunitiesgroup.go
similarity index 63%
rename from services/network/mgmt/2017-06-01/network/bgpservicecommunities.go
rename to services/network/mgmt/2017-06-01/network/bgpservicecommunitiesgroup.go
index 7bc578321474..7b3a255b1dc6 100644
--- a/services/network/mgmt/2017-06-01/network/bgpservicecommunities.go
+++ b/services/network/mgmt/2017-06-01/network/bgpservicecommunitiesgroup.go
@@ -24,47 +24,47 @@ import (
 	"net/http"
 )
 
-// BgpServiceCommunitiesClient is the network Client
-type BgpServiceCommunitiesClient struct {
+// BgpServiceCommunitiesGroupClient is the network Client
+type BgpServiceCommunitiesGroupClient struct {
 	BaseClient
 }
 
-// NewBgpServiceCommunitiesClient creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
-	return NewBgpServiceCommunitiesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewBgpServiceCommunitiesGroupClient creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClient(subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return NewBgpServiceCommunitiesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewBgpServiceCommunitiesClientWithBaseURI creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
-	return BgpServiceCommunitiesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewBgpServiceCommunitiesGroupClientWithBaseURI creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return BgpServiceCommunitiesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available bgp service communities.
-func (client BgpServiceCommunitiesClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
+func (client BgpServiceCommunitiesGroupClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.bsclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.bsclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client BgpServiceCommunitiesGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -84,14 +84,14 @@ func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*ht
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client BgpServiceCommunitiesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client BgpServiceCommunitiesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -103,10 +103,10 @@ func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
 	req, err := lastResults.bgpServiceCommunityListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -114,17 +114,17 @@ func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpService
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client BgpServiceCommunitiesClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/client.go b/services/network/mgmt/2017-06-01/network/client.go
index 4619eca6a6f7..c94ce1ee38a6 100644
--- a/services/network/mgmt/2017-06-01/network/client.go
+++ b/services/network/mgmt/2017-06-01/network/client.go
@@ -21,10 +21,7 @@ package network
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 
 import (
-	"context"
 	"github.com/Azure/go-autorest/autorest"
-	"github.com/Azure/go-autorest/autorest/azure"
-	"net/http"
 )
 
 const (
@@ -52,72 +49,3 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
 		SubscriptionID: subscriptionID,
 	}
 }
-
-// CheckDNSNameAvailability checks whether a domain name in the cloudapp.net zone is available for use.
-//
-// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
-// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
-func (client BaseClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
-	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
-		return
-	}
-
-	resp, err := client.CheckDNSNameAvailabilitySender(req)
-	if err != nil {
-		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure sending request")
-		return
-	}
-
-	result, err = client.CheckDNSNameAvailabilityResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
-	}
-
-	return
-}
-
-// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
-func (client BaseClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
-	pathParameters := map[string]interface{}{
-		"location":       autorest.Encode("path", location),
-		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
-	}
-
-	const APIVersion = "2017-06-01"
-	queryParameters := map[string]interface{}{
-		"api-version": APIVersion,
-	}
-	if len(domainNameLabel) > 0 {
-		queryParameters["domainNameLabel"] = autorest.Encode("query", domainNameLabel)
-	}
-
-	preparer := autorest.CreatePreparer(
-		autorest.AsGet(),
-		autorest.WithBaseURL(client.BaseURI),
-		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
-		autorest.WithQueryParameters(queryParameters))
-	return preparer.Prepare((&http.Request{}).WithContext(ctx))
-}
-
-// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
-// http.Response Body if it receives an error.
-func (client BaseClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
-	return autorest.SendWithSender(client, req,
-		azure.DoRetryWithRegistration(client.Client))
-}
-
-// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
-// closes the http.Response Body.
-func (client BaseClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
-	err = autorest.Respond(
-		resp,
-		client.ByInspecting(),
-		azure.WithErrorUnlessStatusCode(http.StatusOK),
-		autorest.ByUnmarshallingJSON(&result),
-		autorest.ByClosing())
-	result.Response = autorest.Response{Response: resp}
-	return
-}
diff --git a/services/network/mgmt/2017-06-01/network/defaultsecurityrules.go b/services/network/mgmt/2017-06-01/network/defaultsecurityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-06-01/network/defaultsecurityrules.go
rename to services/network/mgmt/2017-06-01/network/defaultsecurityrulesgroup.go
index 0b09f965ae7e..57f46b95e502 100644
--- a/services/network/mgmt/2017-06-01/network/defaultsecurityrules.go
+++ b/services/network/mgmt/2017-06-01/network/defaultsecurityrulesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// DefaultSecurityRulesClient is the network Client
-type DefaultSecurityRulesClient struct {
+// DefaultSecurityRulesGroupClient is the network Client
+type DefaultSecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewDefaultSecurityRulesClient creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClient(subscriptionID string) DefaultSecurityRulesClient {
-	return NewDefaultSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewDefaultSecurityRulesGroupClient creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClient(subscriptionID string) DefaultSecurityRulesGroupClient {
+	return NewDefaultSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewDefaultSecurityRulesClientWithBaseURI creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesClient {
-	return DefaultSecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewDefaultSecurityRulesGroupClientWithBaseURI creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesGroupClient {
+	return DefaultSecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get get the specified default network security rule.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. defaultSecurityRuleName is the name of the default security rule.
-func (client DefaultSecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"defaultSecurityRuleName":  autorest.Encode("path", defaultSecurityRuleName),
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
@@ -89,14 +89,14 @@ func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +111,31 @@ func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client DefaultSecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client DefaultSecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -157,14 +157,14 @@ func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +176,10 @@ func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +187,17 @@ func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client DefaultSecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client DefaultSecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/expressroutecircuitauthorizations.go b/services/network/mgmt/2017-06-01/network/expressroutecircuitauthorizationsgroup.go
similarity index 67%
rename from services/network/mgmt/2017-06-01/network/expressroutecircuitauthorizations.go
rename to services/network/mgmt/2017-06-01/network/expressroutecircuitauthorizationsgroup.go
index 5c65f916f0b2..3ce7771439b9 100644
--- a/services/network/mgmt/2017-06-01/network/expressroutecircuitauthorizations.go
+++ b/services/network/mgmt/2017-06-01/network/expressroutecircuitauthorizationsgroup.go
@@ -24,21 +24,21 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitAuthorizationsClient is the network Client
-type ExpressRouteCircuitAuthorizationsClient struct {
+// ExpressRouteCircuitAuthorizationsGroupClient is the network Client
+type ExpressRouteCircuitAuthorizationsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitAuthorizationsClient creates an instance of the ExpressRouteCircuitAuthorizationsClient
-// client.
-func NewExpressRouteCircuitAuthorizationsClient(subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return NewExpressRouteCircuitAuthorizationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitAuthorizationsGroupClient creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClient(subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitAuthorizationsClientWithBaseURI creates an instance of the
-// ExpressRouteCircuitAuthorizationsClient client.
-func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return ExpressRouteCircuitAuthorizationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return ExpressRouteCircuitAuthorizationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an authorization in the specified express route circuit.
@@ -46,16 +46,16 @@ func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subsc
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization. authorizationParameters is parameters supplied to the create
 // or update express route circuit authorization operation.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, authorizationName, authorizationParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -63,7 +63,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -88,7 +88,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -103,7 +103,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -118,16 +118,16 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(re
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -135,7 +135,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -158,7 +158,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -173,7 +173,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Req
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -187,30 +187,30 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -233,14 +233,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Co
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -254,31 +254,31 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Re
 // List gets all authorizations in an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit.
-func (client ExpressRouteCircuitAuthorizationsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.alr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.alr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -300,14 +300,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.C
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -319,10 +319,10 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.R
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
 	req, err := lastResults.authorizationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -330,17 +330,17 @@ func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitAuthorizationsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/expressroutecircuitpeerings.go b/services/network/mgmt/2017-06-01/network/expressroutecircuitpeeringsgroup.go
similarity index 68%
rename from services/network/mgmt/2017-06-01/network/expressroutecircuitpeerings.go
rename to services/network/mgmt/2017-06-01/network/expressroutecircuitpeeringsgroup.go
index 634ccc2a7dd1..ae660cd9072c 100644
--- a/services/network/mgmt/2017-06-01/network/expressroutecircuitpeerings.go
+++ b/services/network/mgmt/2017-06-01/network/expressroutecircuitpeeringsgroup.go
@@ -24,19 +24,20 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitPeeringsClient is the network Client
-type ExpressRouteCircuitPeeringsClient struct {
+// ExpressRouteCircuitPeeringsGroupClient is the network Client
+type ExpressRouteCircuitPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitPeeringsClient creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return NewExpressRouteCircuitPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitPeeringsGroupClient creates an instance of the ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClient(subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitPeeringsClientWithBaseURI creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return ExpressRouteCircuitPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitPeeringsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return ExpressRouteCircuitPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified express route circuits.
@@ -44,16 +45,16 @@ func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptio
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. peeringParameters is parameters supplied to the create or update express
 // route circuit peering operation.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, peeringName, peeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +62,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Conte
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -86,7 +87,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +102,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.R
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +117,16 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +134,7 @@ func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, reso
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -156,7 +157,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Conte
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +172,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request)
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +186,30 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -231,14 +232,14 @@ func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context,
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +253,31 @@ func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response
 // List gets all peerings in a specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitPeeringsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ercplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ercplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -298,14 +299,14 @@ func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +318,10 @@ func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Respons
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
 	req, err := lastResults.expressRouteCircuitPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +329,17 @@ func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults Expr
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/expressroutecircuits.go b/services/network/mgmt/2017-06-01/network/expressroutecircuitsgroup.go
similarity index 71%
rename from services/network/mgmt/2017-06-01/network/expressroutecircuits.go
rename to services/network/mgmt/2017-06-01/network/expressroutecircuitsgroup.go
index 0ce4c8ab5fe4..3b18138a6a5b 100644
--- a/services/network/mgmt/2017-06-01/network/expressroutecircuits.go
+++ b/services/network/mgmt/2017-06-01/network/expressroutecircuitsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitsClient is the network Client
-type ExpressRouteCircuitsClient struct {
+// ExpressRouteCircuitsGroupClient is the network Client
+type ExpressRouteCircuitsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitsClient creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
-	return NewExpressRouteCircuitsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitsGroupClient creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClient(subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return NewExpressRouteCircuitsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitsClientWithBaseURI creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
-	return ExpressRouteCircuitsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitsGroupClientWithBaseURI creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return ExpressRouteCircuitsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is
 // parameters supplied to the create or update express route circuit operation.
-func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Resp
 // Delete deletes the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -180,30 +180,30 @@ func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (r
 // Get gets information about the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of express route circuit.
-func (client ExpressRouteCircuitsClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -225,14 +225,14 @@ func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -247,30 +247,30 @@ func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitsClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetPeeringStatsPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetPeeringStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetPeeringStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPeeringStatsPreparer prepares the GetPeeringStats request.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -293,14 +293,14 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Con
 
 // GetPeeringStatsSender sends the GetPeeringStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetPeeringStatsResponder handles the response to the GetPeeringStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,30 +314,30 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Res
 // GetStats gets all the stats from an express route circuit in a resource group.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetStatsPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetStatsPreparer prepares the GetStats request.
-func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -359,14 +359,14 @@ func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, r
 
 // GetStatsSender sends the GetStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetStatsResponder handles the response to the GetStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -380,31 +380,31 @@ func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response)
 // List gets all the express route circuits in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ExpressRouteCircuitsClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -425,14 +425,14 @@ func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -444,10 +444,10 @@ func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -455,47 +455,47 @@ func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRout
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the express route circuits in a subscription.
-func (client ExpressRouteCircuitsClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -515,14 +515,14 @@ func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -534,10 +534,10 @@ func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -545,17 +545,17 @@ func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressR
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -564,16 +564,16 @@ func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (r
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	req, err := client.ListArpTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListArpTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -581,7 +581,7 @@ func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resou
 }
 
 // ListArpTablePreparer prepares the ListArpTable request.
-func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -605,7 +605,7 @@ func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Contex
 
 // ListArpTableSender sends the ListArpTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -620,7 +620,7 @@ func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (
 
 // ListArpTableResponder handles the response to the ListArpTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -636,16 +636,16 @@ func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	req, err := client.ListRoutesTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -653,7 +653,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, re
 }
 
 // ListRoutesTablePreparer prepares the ListRoutesTable request.
-func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -677,7 +677,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Con
 
 // ListRoutesTableSender sends the ListRoutesTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -692,7 +692,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request
 
 // ListRoutesTableResponder handles the response to the ListRoutesTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -708,16 +708,16 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	req, err := client.ListRoutesTableSummaryPreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSummarySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -725,7 +725,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Cont
 }
 
 // ListRoutesTableSummaryPreparer prepares the ListRoutesTableSummary request.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -749,7 +749,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx cont
 
 // ListRoutesTableSummarySender sends the ListRoutesTableSummary request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -764,7 +764,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.
 
 // ListRoutesTableSummaryResponder handles the response to the ListRoutesTableSummary request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-06-01/network/expressrouteserviceproviders.go b/services/network/mgmt/2017-06-01/network/expressrouteserviceprovidersgroup.go
similarity index 61%
rename from services/network/mgmt/2017-06-01/network/expressrouteserviceproviders.go
rename to services/network/mgmt/2017-06-01/network/expressrouteserviceprovidersgroup.go
index eee277df0253..ef764958c09a 100644
--- a/services/network/mgmt/2017-06-01/network/expressrouteserviceproviders.go
+++ b/services/network/mgmt/2017-06-01/network/expressrouteserviceprovidersgroup.go
@@ -24,48 +24,49 @@ import (
 	"net/http"
 )
 
-// ExpressRouteServiceProvidersClient is the network Client
-type ExpressRouteServiceProvidersClient struct {
+// ExpressRouteServiceProvidersGroupClient is the network Client
+type ExpressRouteServiceProvidersGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteServiceProvidersClient creates an instance of the ExpressRouteServiceProvidersClient client.
-func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
-	return NewExpressRouteServiceProvidersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteServiceProvidersGroupClient creates an instance of the ExpressRouteServiceProvidersGroupClient
+// client.
+func NewExpressRouteServiceProvidersGroupClient(subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return NewExpressRouteServiceProvidersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteServiceProvidersClientWithBaseURI creates an instance of the ExpressRouteServiceProvidersClient
-// client.
-func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
-	return ExpressRouteServiceProvidersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteServiceProvidersGroupClientWithBaseURI creates an instance of the
+// ExpressRouteServiceProvidersGroupClient client.
+func NewExpressRouteServiceProvidersGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return ExpressRouteServiceProvidersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available express route service providers.
-func (client ExpressRouteServiceProvidersClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ersplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ersplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -85,14 +86,14 @@ func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteServiceProvidersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -104,10 +105,10 @@ func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Respon
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
 	req, err := lastResults.expressRouteServiceProviderListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -115,17 +116,17 @@ func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults Exp
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteServiceProvidersClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/group.go b/services/network/mgmt/2017-06-01/network/group.go
new file mode 100644
index 000000000000..fd0cc502130e
--- /dev/null
+++ b/services/network/mgmt/2017-06-01/network/group.go
@@ -0,0 +1,109 @@
+package network
+
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"context"
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"net/http"
+)
+
+// GroupClient is the network Client
+type GroupClient struct {
+	BaseClient
+}
+
+// NewGroupClient creates an instance of the GroupClient client.
+func NewGroupClient(subscriptionID string) GroupClient {
+	return NewGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
+}
+
+// NewGroupClientWithBaseURI creates an instance of the GroupClient client.
+func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
+	return GroupClient{NewWithBaseURI(baseURI, subscriptionID)}
+}
+
+// CheckDNSNameAvailability checks whether a domain name in the cloudapp.net zone is available for use.
+//
+// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
+// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+func (client GroupClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
+	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := client.CheckDNSNameAvailabilitySender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure sending request")
+		return
+	}
+
+	result, err = client.CheckDNSNameAvailabilityResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
+	}
+
+	return
+}
+
+// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
+func (client GroupClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
+	pathParameters := map[string]interface{}{
+		"location":       autorest.Encode("path", location),
+		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
+	}
+
+	const APIVersion = "2017-06-01"
+	queryParameters := map[string]interface{}{
+		"api-version": APIVersion,
+	}
+	if len(domainNameLabel) > 0 {
+		queryParameters["domainNameLabel"] = autorest.Encode("query", domainNameLabel)
+	}
+
+	preparer := autorest.CreatePreparer(
+		autorest.AsGet(),
+		autorest.WithBaseURL(client.BaseURI),
+		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
+		autorest.WithQueryParameters(queryParameters))
+	return preparer.Prepare((&http.Request{}).WithContext(ctx))
+}
+
+// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
+// http.Response Body if it receives an error.
+func (client GroupClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
+	return autorest.SendWithSender(client, req,
+		azure.DoRetryWithRegistration(client.Client))
+}
+
+// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
+// closes the http.Response Body.
+func (client GroupClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
+	err = autorest.Respond(
+		resp,
+		client.ByInspecting(),
+		azure.WithErrorUnlessStatusCode(http.StatusOK),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}
diff --git a/services/network/mgmt/2017-06-01/network/inboundnatrules.go b/services/network/mgmt/2017-06-01/network/inboundnatrulesgroup.go
similarity index 74%
rename from services/network/mgmt/2017-06-01/network/inboundnatrules.go
rename to services/network/mgmt/2017-06-01/network/inboundnatrulesgroup.go
index 6ca8acb277f0..38d80940fdea 100644
--- a/services/network/mgmt/2017-06-01/network/inboundnatrules.go
+++ b/services/network/mgmt/2017-06-01/network/inboundnatrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// InboundNatRulesClient is the network Client
-type InboundNatRulesClient struct {
+// InboundNatRulesGroupClient is the network Client
+type InboundNatRulesGroupClient struct {
 	BaseClient
 }
 
-// NewInboundNatRulesClient creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClient(subscriptionID string) InboundNatRulesClient {
-	return NewInboundNatRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInboundNatRulesGroupClient creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClient(subscriptionID string) InboundNatRulesGroupClient {
+	return NewInboundNatRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInboundNatRulesClientWithBaseURI creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesClient {
-	return InboundNatRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInboundNatRulesGroupClientWithBaseURI creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesGroupClient {
+	return InboundNatRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer inbound nat rule.
@@ -45,7 +45,7 @@ func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. inboundNatRuleParameters is parameters supplied to the
 // create or update inbound nat rule operation.
-func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: inboundNatRuleParameters,
 			Constraints: []validation.Constraint{{Target: "inboundNatRuleParameters.InboundNatRulePropertiesFormat", Name: validation.Null, Rule: false,
@@ -62,18 +62,18 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 						}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.InboundNatRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.InboundNatRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -81,7 +81,7 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -106,7 +106,7 @@ func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -121,7 +121,7 @@ func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -136,16 +136,16 @@ func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule.
-func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -153,7 +153,7 @@ func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -176,7 +176,7 @@ func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) DeleteSender(req *http.Request) (future InboundNatRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -191,7 +191,7 @@ func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future Inbo
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InboundNatRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -205,30 +205,30 @@ func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. expand is expands referenced resources.
-func (client InboundNatRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -254,14 +254,14 @@ func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -275,31 +275,31 @@ func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result In
 // List gets all the inbound nat rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client InboundNatRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
+func (client InboundNatRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.inrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.inrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -321,14 +321,14 @@ func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -340,10 +340,10 @@ func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result I
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
 	req, err := lastResults.inboundNatRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -351,17 +351,17 @@ func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InboundNatRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
+func (client InboundNatRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/interfaceipconfigurations.go b/services/network/mgmt/2017-06-01/network/interfaceipconfigurationsgroup.go
similarity index 66%
rename from services/network/mgmt/2017-06-01/network/interfaceipconfigurations.go
rename to services/network/mgmt/2017-06-01/network/interfaceipconfigurationsgroup.go
index 352cf9390ab2..7b1ad420db86 100644
--- a/services/network/mgmt/2017-06-01/network/interfaceipconfigurations.go
+++ b/services/network/mgmt/2017-06-01/network/interfaceipconfigurationsgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// InterfaceIPConfigurationsClient is the network Client
-type InterfaceIPConfigurationsClient struct {
+// InterfaceIPConfigurationsGroupClient is the network Client
+type InterfaceIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceIPConfigurationsClient creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClient(subscriptionID string) InterfaceIPConfigurationsClient {
-	return NewInterfaceIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceIPConfigurationsGroupClient creates an instance of the InterfaceIPConfigurationsGroupClient client.
+func NewInterfaceIPConfigurationsGroupClient(subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return NewInterfaceIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceIPConfigurationsClientWithBaseURI creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsClient {
-	return InterfaceIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceIPConfigurationsGroupClientWithBaseURI creates an instance of the InterfaceIPConfigurationsGroupClient
+// client.
+func NewInterfaceIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return InterfaceIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified network interface ip configuration.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // IPConfigurationName is the name of the ip configuration name.
-func (client InterfaceIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":  autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
@@ -89,14 +90,14 @@ func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, r
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +111,31 @@ func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response)
 // List get all ip configurations in a network interface
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
+func (client InterfaceIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.iiclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.iiclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -156,14 +157,14 @@ func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +176,10 @@ func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceIPConfigurationsClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
 	req, err := lastResults.interfaceIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +187,17 @@ func (client InterfaceIPConfigurationsClient) listNextResults(lastResults Interf
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/interfaceloadbalancers.go b/services/network/mgmt/2017-06-01/network/interfaceloadbalancersgroup.go
similarity index 63%
rename from services/network/mgmt/2017-06-01/network/interfaceloadbalancers.go
rename to services/network/mgmt/2017-06-01/network/interfaceloadbalancersgroup.go
index a0ea2c2187d5..5579687a80d5 100644
--- a/services/network/mgmt/2017-06-01/network/interfaceloadbalancers.go
+++ b/services/network/mgmt/2017-06-01/network/interfaceloadbalancersgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// InterfaceLoadBalancersClient is the network Client
-type InterfaceLoadBalancersClient struct {
+// InterfaceLoadBalancersGroupClient is the network Client
+type InterfaceLoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceLoadBalancersClient creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClient(subscriptionID string) InterfaceLoadBalancersClient {
-	return NewInterfaceLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceLoadBalancersGroupClient creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClient(subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return NewInterfaceLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceLoadBalancersClientWithBaseURI creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersClient {
-	return InterfaceLoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceLoadBalancersGroupClientWithBaseURI creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return InterfaceLoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List get all load balancers in a network interface
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceLoadBalancersClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
+func (client InterfaceLoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceLoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -88,14 +88,14 @@ func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceLoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceLoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -107,10 +107,10 @@ func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceLoadBalancersClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
 	req, err := lastResults.interfaceLoadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -118,17 +118,17 @@ func (client InterfaceLoadBalancersClient) listNextResults(lastResults Interface
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceLoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/interfaces.go b/services/network/mgmt/2017-06-01/network/interfacesgroup.go
similarity index 66%
rename from services/network/mgmt/2017-06-01/network/interfaces.go
rename to services/network/mgmt/2017-06-01/network/interfacesgroup.go
index 3fc4c118f085..22d19b8dfc59 100644
--- a/services/network/mgmt/2017-06-01/network/interfaces.go
+++ b/services/network/mgmt/2017-06-01/network/interfacesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// InterfacesClient is the network Client
-type InterfacesClient struct {
+// InterfacesGroupClient is the network Client
+type InterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewInterfacesClient creates an instance of the InterfacesClient client.
-func NewInterfacesClient(subscriptionID string) InterfacesClient {
-	return NewInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfacesGroupClient creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClient(subscriptionID string) InterfacesGroupClient {
+	return NewInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfacesClientWithBaseURI creates an instance of the InterfacesClient client.
-func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
-	return InterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfacesGroupClientWithBaseURI creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfacesGroupClient {
+	return InterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // parameters is parameters supplied to the create or update network interface operation.
-func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkInterfaceName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroup
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
+func (client InterfacesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resou
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateSender(req *http.Request) (future InterfacesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future I
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (res
 // Delete deletes the specified network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName str
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroup
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) DeleteSender(req *http.Request) (future InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) DeleteSender(req *http.Request) (future InterfacesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client InterfacesClient) DeleteSender(req *http.Request) (future Interface
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InterfacesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client InterfacesClient) DeleteResponder(resp *http.Response) (result auto
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // expand is expands referenced resources.
-func (client InterfacesClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupNam
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,16 +250,16 @@ func (client InterfacesClient) GetResponder(resp *http.Response) (result Interfa
 // GetEffectiveRouteTable gets all route tables applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	req, err := client.GetEffectiveRouteTablePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetEffectiveRouteTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -267,7 +267,7 @@ func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resou
 }
 
 // GetEffectiveRouteTablePreparer prepares the GetEffectiveRouteTable request.
-func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -289,7 +289,7 @@ func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Contex
 
 // GetEffectiveRouteTableSender sends the GetEffectiveRouteTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -304,7 +304,7 @@ func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (
 
 // GetEffectiveRouteTableResponder handles the response to the GetEffectiveRouteTable request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,30 +320,30 @@ func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Respon
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. expand is expands referenced resources.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetNetworkInterfaceSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetNetworkInterfaceResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetNetworkInterfacePreparer prepares the GetVirtualMachineScaleSetNetworkInterface request.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
@@ -370,14 +370,14 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer
 
 // GetVirtualMachineScaleSetNetworkInterfaceSender sends the GetVirtualMachineScaleSetNetworkInterface request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetNetworkInterfaceResponder handles the response to the GetVirtualMachineScaleSetNetworkInterface request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -391,31 +391,31 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponde
 // List gets all network interfaces in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client InterfacesClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -436,14 +436,14 @@ func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupNa
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -455,10 +455,10 @@ func (client InterfacesClient) ListResponder(resp *http.Response) (result Interf
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -466,47 +466,47 @@ func (client InterfacesClient) listNextResults(lastResults InterfaceListResult)
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network interfaces in a subscription.
-func (client InterfacesClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client InterfacesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -526,14 +526,14 @@ func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Reque
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -545,10 +545,10 @@ func (client InterfacesClient) ListAllResponder(resp *http.Response) (result Int
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -556,17 +556,17 @@ func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResul
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -574,16 +574,16 @@ func (client InterfacesClient) ListAllComplete(ctx context.Context) (result Inte
 // ListEffectiveNetworkSecurityGroups gets all network security groups applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	req, err := client.ListEffectiveNetworkSecurityGroupsPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListEffectiveNetworkSecurityGroupsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -591,7 +591,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Co
 }
 
 // ListEffectiveNetworkSecurityGroupsPreparer prepares the ListEffectiveNetworkSecurityGroups request.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -613,7 +613,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx co
 
 // ListEffectiveNetworkSecurityGroupsSender sends the ListEffectiveNetworkSecurityGroups request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -628,7 +628,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *htt
 
 // ListEffectiveNetworkSecurityGroupsResponder handles the response to the ListEffectiveNetworkSecurityGroups request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -643,31 +643,31 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -689,14 +689,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPrepar
 
 // ListVirtualMachineScaleSetNetworkInterfacesSender sends the ListVirtualMachineScaleSetNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -708,10 +708,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesRespon
 }
 
 // listVirtualMachineScaleSetNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -719,17 +719,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextRe
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -739,31 +739,31 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComple
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetVMNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -786,14 +786,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPrep
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesSender sends the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -805,10 +805,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResp
 }
 
 // listVirtualMachineScaleSetVMNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -816,17 +816,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNext
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/loadbalancerbackendaddresspools.go b/services/network/mgmt/2017-06-01/network/loadbalancerbackendaddresspoolsgroup.go
similarity index 64%
rename from services/network/mgmt/2017-06-01/network/loadbalancerbackendaddresspools.go
rename to services/network/mgmt/2017-06-01/network/loadbalancerbackendaddresspoolsgroup.go
index c355630b1bc7..0a72084005b7 100644
--- a/services/network/mgmt/2017-06-01/network/loadbalancerbackendaddresspools.go
+++ b/services/network/mgmt/2017-06-01/network/loadbalancerbackendaddresspoolsgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerBackendAddressPoolsClient is the network Client
-type LoadBalancerBackendAddressPoolsClient struct {
+// LoadBalancerBackendAddressPoolsGroupClient is the network Client
+type LoadBalancerBackendAddressPoolsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerBackendAddressPoolsClient creates an instance of the LoadBalancerBackendAddressPoolsClient client.
-func NewLoadBalancerBackendAddressPoolsClient(subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return NewLoadBalancerBackendAddressPoolsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerBackendAddressPoolsGroupClient creates an instance of the LoadBalancerBackendAddressPoolsGroupClient
+// client.
+func NewLoadBalancerBackendAddressPoolsGroupClient(subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerBackendAddressPoolsClientWithBaseURI creates an instance of the LoadBalancerBackendAddressPoolsClient
-// client.
-func NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return LoadBalancerBackendAddressPoolsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerBackendAddressPoolsGroupClient client.
+func NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return LoadBalancerBackendAddressPoolsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer backend address pool.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // backendAddressPoolName is the name of the backend address pool.
-func (client LoadBalancerBackendAddressPoolsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, backendAddressPoolName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"backendAddressPoolName": autorest.Encode("path", backendAddressPoolName),
 		"loadBalancerName":       autorest.Encode("path", loadBalancerName),
@@ -90,14 +91,14 @@ func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Cont
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Resp
 // List gets all the load balancer backed address pools.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerBackendAddressPoolsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbbaplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbbaplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Con
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	req, err := lastResults.loadBalancerBackendAddressPoolListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerBackendAddressPoolsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/loadbalancerfrontendipconfigurations.go b/services/network/mgmt/2017-06-01/network/loadbalancerfrontendipconfigurationsgroup.go
similarity index 63%
rename from services/network/mgmt/2017-06-01/network/loadbalancerfrontendipconfigurations.go
rename to services/network/mgmt/2017-06-01/network/loadbalancerfrontendipconfigurationsgroup.go
index e60e40d67d38..f1fe0e59548a 100644
--- a/services/network/mgmt/2017-06-01/network/loadbalancerfrontendipconfigurations.go
+++ b/services/network/mgmt/2017-06-01/network/loadbalancerfrontendipconfigurationsgroup.go
@@ -24,51 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerFrontendIPConfigurationsClient is the network Client
-type LoadBalancerFrontendIPConfigurationsClient struct {
+// LoadBalancerFrontendIPConfigurationsGroupClient is the network Client
+type LoadBalancerFrontendIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClient creates an instance of the LoadBalancerFrontendIPConfigurationsClient
-// client.
-func NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerFrontendIPConfigurationsGroupClient creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI creates an instance of the
-// LoadBalancerFrontendIPConfigurationsClient client.
-func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return LoadBalancerFrontendIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return LoadBalancerFrontendIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer frontend IP configuration.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // frontendIPConfigurationName is the name of the frontend IP configuration.
-func (client LoadBalancerFrontendIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, frontendIPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"frontendIPConfigurationName": autorest.Encode("path", frontendIPConfigurationName),
 		"loadBalancerName":            autorest.Encode("path", loadBalancerName),
@@ -91,14 +91,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -112,31 +112,31 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http
 // List gets all the load balancer frontend IP configurations.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerFrontendIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbficlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbficlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -158,14 +158,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -177,10 +177,10 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *htt
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	req, err := lastResults.loadBalancerFrontendIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -188,17 +188,17 @@ func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastRes
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/loadbalancerloadbalancingrules.go b/services/network/mgmt/2017-06-01/network/loadbalancerloadbalancingrulesgroup.go
similarity index 65%
rename from services/network/mgmt/2017-06-01/network/loadbalancerloadbalancingrules.go
rename to services/network/mgmt/2017-06-01/network/loadbalancerloadbalancingrulesgroup.go
index a16458544278..aabcfd180a89 100644
--- a/services/network/mgmt/2017-06-01/network/loadbalancerloadbalancingrules.go
+++ b/services/network/mgmt/2017-06-01/network/loadbalancerloadbalancingrulesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerLoadBalancingRulesClient is the network Client
-type LoadBalancerLoadBalancingRulesClient struct {
+// LoadBalancerLoadBalancingRulesGroupClient is the network Client
+type LoadBalancerLoadBalancingRulesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerLoadBalancingRulesClient creates an instance of the LoadBalancerLoadBalancingRulesClient client.
-func NewLoadBalancerLoadBalancingRulesClient(subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return NewLoadBalancerLoadBalancingRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerLoadBalancingRulesGroupClient creates an instance of the LoadBalancerLoadBalancingRulesGroupClient
+// client.
+func NewLoadBalancerLoadBalancingRulesGroupClient(subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerLoadBalancingRulesClientWithBaseURI creates an instance of the LoadBalancerLoadBalancingRulesClient
-// client.
-func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return LoadBalancerLoadBalancingRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerLoadBalancingRulesGroupClient client.
+func NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return LoadBalancerLoadBalancingRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified load balancer load balancing rule.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // loadBalancingRuleName is the name of the load balancing rule.
-func (client LoadBalancerLoadBalancingRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, loadBalancingRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":      autorest.Encode("path", loadBalancerName),
 		"loadBalancingRuleName": autorest.Encode("path", loadBalancingRuleName),
@@ -90,14 +91,14 @@ func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Conte
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Respo
 // List gets all the load balancing rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerLoadBalancingRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblbrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblbrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Cont
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Resp
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	req, err := lastResults.loadBalancerLoadBalancingRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults L
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerLoadBalancingRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/loadbalancernetworkinterfaces.go b/services/network/mgmt/2017-06-01/network/loadbalancernetworkinterfacesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-06-01/network/loadbalancernetworkinterfaces.go
rename to services/network/mgmt/2017-06-01/network/loadbalancernetworkinterfacesgroup.go
index e72fae96d390..8e247c8b5ab3 100644
--- a/services/network/mgmt/2017-06-01/network/loadbalancernetworkinterfaces.go
+++ b/services/network/mgmt/2017-06-01/network/loadbalancernetworkinterfacesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerNetworkInterfacesClient is the network Client
-type LoadBalancerNetworkInterfacesClient struct {
+// LoadBalancerNetworkInterfacesGroupClient is the network Client
+type LoadBalancerNetworkInterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerNetworkInterfacesClient creates an instance of the LoadBalancerNetworkInterfacesClient client.
-func NewLoadBalancerNetworkInterfacesClient(subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return NewLoadBalancerNetworkInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerNetworkInterfacesGroupClient creates an instance of the LoadBalancerNetworkInterfacesGroupClient
+// client.
+func NewLoadBalancerNetworkInterfacesGroupClient(subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerNetworkInterfacesClientWithBaseURI creates an instance of the LoadBalancerNetworkInterfacesClient
-// client.
-func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return LoadBalancerNetworkInterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerNetworkInterfacesGroupClient client.
+func NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return LoadBalancerNetworkInterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets associated load balancer network interfaces.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerNetworkInterfacesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -89,14 +90,14 @@ func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Conte
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerNetworkInterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -108,10 +109,10 @@ func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Respo
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -119,17 +120,17 @@ func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults In
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerNetworkInterfacesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/loadbalancerprobes.go b/services/network/mgmt/2017-06-01/network/loadbalancerprobesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-06-01/network/loadbalancerprobes.go
rename to services/network/mgmt/2017-06-01/network/loadbalancerprobesgroup.go
index 382e3f62e3a1..d8f1f59cdca0 100644
--- a/services/network/mgmt/2017-06-01/network/loadbalancerprobes.go
+++ b/services/network/mgmt/2017-06-01/network/loadbalancerprobesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// LoadBalancerProbesClient is the network Client
-type LoadBalancerProbesClient struct {
+// LoadBalancerProbesGroupClient is the network Client
+type LoadBalancerProbesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerProbesClient creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClient(subscriptionID string) LoadBalancerProbesClient {
-	return NewLoadBalancerProbesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerProbesGroupClient creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClient(subscriptionID string) LoadBalancerProbesGroupClient {
+	return NewLoadBalancerProbesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerProbesClientWithBaseURI creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesClient {
-	return LoadBalancerProbesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerProbesGroupClientWithBaseURI creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesGroupClient {
+	return LoadBalancerProbesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer probe.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // probeName is the name of the probe.
-func (client LoadBalancerProbesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, probeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"probeName":         autorest.Encode("path", probeName),
@@ -89,14 +89,14 @@ func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resource
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) GetResponder(resp *http.Response) (result Probe, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +110,31 @@ func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result
 // List gets all the load balancer probes.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerProbesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
+func (client LoadBalancerProbesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -156,14 +156,14 @@ func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourc
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +175,10 @@ func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (resul
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
 	req, err := lastResults.loadBalancerProbeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +186,17 @@ func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerP
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerProbesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
+func (client LoadBalancerProbesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/loadbalancers.go b/services/network/mgmt/2017-06-01/network/loadbalancersgroup.go
similarity index 65%
rename from services/network/mgmt/2017-06-01/network/loadbalancers.go
rename to services/network/mgmt/2017-06-01/network/loadbalancersgroup.go
index e25e4a36d533..8f1c037e7372 100644
--- a/services/network/mgmt/2017-06-01/network/loadbalancers.go
+++ b/services/network/mgmt/2017-06-01/network/loadbalancersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// LoadBalancersClient is the network Client
-type LoadBalancersClient struct {
+// LoadBalancersGroupClient is the network Client
+type LoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancersClient creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClient(subscriptionID string) LoadBalancersClient {
-	return NewLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancersGroupClient creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClient(subscriptionID string) LoadBalancersGroupClient {
+	return NewLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancersClientWithBaseURI creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersClient {
-	return LoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancersGroupClientWithBaseURI creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersGroupClient {
+	return LoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // parameters is parameters supplied to the create or update load balancer operation.
-func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
+func (client LoadBalancersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (
 // Delete deletes the specified load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) DeleteSender(req *http.Request) (future LoadBalancersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBa
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LoadBalancersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. expand
 // is expands referenced resources.
-func (client LoadBalancersClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client LoadBalancersClient) GetResponder(resp *http.Response) (result Load
 // List gets all the load balancers in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LoadBalancersClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client LoadBalancersClient) ListResponder(resp *http.Response) (result Loa
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the load balancers in a subscription.
-func (client LoadBalancersClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Re
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerLis
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/localnetworkgateways.go b/services/network/mgmt/2017-06-01/network/localnetworkgatewaysgroup.go
similarity index 71%
rename from services/network/mgmt/2017-06-01/network/localnetworkgateways.go
rename to services/network/mgmt/2017-06-01/network/localnetworkgatewaysgroup.go
index 81ec4d392d7b..b9dcf479b65f 100644
--- a/services/network/mgmt/2017-06-01/network/localnetworkgateways.go
+++ b/services/network/mgmt/2017-06-01/network/localnetworkgatewaysgroup.go
@@ -25,43 +25,43 @@ import (
 	"net/http"
 )
 
-// LocalNetworkGatewaysClient is the network Client
-type LocalNetworkGatewaysClient struct {
+// LocalNetworkGatewaysGroupClient is the network Client
+type LocalNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewLocalNetworkGatewaysClient creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
-	return NewLocalNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLocalNetworkGatewaysGroupClient creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClient(subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return NewLocalNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLocalNetworkGatewaysClientWithBaseURI creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
-	return LocalNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLocalNetworkGatewaysGroupClientWithBaseURI creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return LocalNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a local network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway. parameters is parameters supplied to the create or update local network gateway operation.
-func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}},
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, localNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -69,7 +69,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -93,7 +93,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -108,7 +108,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -123,22 +123,22 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Resp
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Delete", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Delete", err.Error())
 	}
 
 	req, err := client.DeletePreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -146,7 +146,7 @@ func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -168,7 +168,7 @@ func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -183,7 +183,7 @@ func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -197,36 +197,36 @@ func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Get", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Get", err.Error())
 	}
 
 	req, err := client.GetPreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -248,14 +248,14 @@ func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -269,31 +269,31 @@ func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (resu
 // List gets all the local network gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LocalNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
+func (client LocalNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -314,14 +314,14 @@ func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,10 +333,10 @@ func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
 	req, err := lastResults.localNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -344,17 +344,17 @@ func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetwor
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/models.go b/services/network/mgmt/2017-06-01/network/models.go
index 2a97eee67cf1..865a65502012 100644
--- a/services/network/mgmt/2017-06-01/network/models.go
+++ b/services/network/mgmt/2017-06-01/network/models.go
@@ -36,6 +36,11 @@ const (
 	Deny Access = "Deny"
 )
 
+// PossibleAccessValues returns an array of possible values for the Access const type.
+func PossibleAccessValues() [2]Access {
+	return [2]Access{Allow, Deny}
+}
+
 // ApplicationGatewayBackendHealthServerHealth enumerates the values for application gateway backend health
 // server health.
 type ApplicationGatewayBackendHealthServerHealth string
@@ -53,6 +58,11 @@ const (
 	Up ApplicationGatewayBackendHealthServerHealth = "Up"
 )
 
+// PossibleApplicationGatewayBackendHealthServerHealthValues returns an array of possible values for the ApplicationGatewayBackendHealthServerHealth const type.
+func PossibleApplicationGatewayBackendHealthServerHealthValues() [5]ApplicationGatewayBackendHealthServerHealth {
+	return [5]ApplicationGatewayBackendHealthServerHealth{Down, Draining, Partial, Unknown, Up}
+}
+
 // ApplicationGatewayCookieBasedAffinity enumerates the values for application gateway cookie based affinity.
 type ApplicationGatewayCookieBasedAffinity string
 
@@ -63,6 +73,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayFirewallMode enumerates the values for application gateway firewall mode.
 type ApplicationGatewayFirewallMode string
 
@@ -73,6 +88,11 @@ const (
 	Prevention ApplicationGatewayFirewallMode = "Prevention"
 )
 
+// PossibleApplicationGatewayFirewallModeValues returns an array of possible values for the ApplicationGatewayFirewallMode const type.
+func PossibleApplicationGatewayFirewallModeValues() [2]ApplicationGatewayFirewallMode {
+	return [2]ApplicationGatewayFirewallMode{Detection, Prevention}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -87,6 +107,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -97,6 +122,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRedirectType enumerates the values for application gateway redirect type.
 type ApplicationGatewayRedirectType string
 
@@ -111,6 +141,11 @@ const (
 	Temporary ApplicationGatewayRedirectType = "Temporary"
 )
 
+// PossibleApplicationGatewayRedirectTypeValues returns an array of possible values for the ApplicationGatewayRedirectType const type.
+func PossibleApplicationGatewayRedirectTypeValues() [4]ApplicationGatewayRedirectType {
+	return [4]ApplicationGatewayRedirectType{Found, Permanent, SeeOther, Temporary}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -122,6 +157,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -138,6 +178,11 @@ const (
 	WAFMedium ApplicationGatewaySkuName = "WAF_Medium"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [5]ApplicationGatewaySkuName {
+	return [5]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall, WAFLarge, WAFMedium}
+}
+
 // ApplicationGatewaySslCipherSuite enumerates the values for application gateway ssl cipher suite.
 type ApplicationGatewaySslCipherSuite string
 
@@ -194,6 +239,11 @@ const (
 	TLSRSAWITHAES256GCMSHA384 ApplicationGatewaySslCipherSuite = "TLS_RSA_WITH_AES_256_GCM_SHA384"
 )
 
+// PossibleApplicationGatewaySslCipherSuiteValues returns an array of possible values for the ApplicationGatewaySslCipherSuite const type.
+func PossibleApplicationGatewaySslCipherSuiteValues() [25]ApplicationGatewaySslCipherSuite {
+	return [25]ApplicationGatewaySslCipherSuite{TLSDHEDSSWITHAES128CBCSHA, TLSDHEDSSWITHAES128CBCSHA256, TLSDHEDSSWITHAES256CBCSHA, TLSDHEDSSWITHAES256CBCSHA256, TLSDHERSAWITHAES128CBCSHA, TLSDHERSAWITHAES128GCMSHA256, TLSDHERSAWITHAES256CBCSHA, TLSDHERSAWITHAES256GCMSHA384, TLSECDHEECDSAWITHAES128CBCSHA, TLSECDHEECDSAWITHAES128CBCSHA256, TLSECDHEECDSAWITHAES128GCMSHA256, TLSECDHEECDSAWITHAES256CBCSHA, TLSECDHEECDSAWITHAES256CBCSHA384, TLSECDHEECDSAWITHAES256GCMSHA384, TLSECDHERSAWITHAES128CBCSHA, TLSECDHERSAWITHAES128CBCSHA256, TLSECDHERSAWITHAES256CBCSHA, TLSECDHERSAWITHAES256CBCSHA384, TLSRSAWITH3DESEDECBCSHA, TLSRSAWITHAES128CBCSHA, TLSRSAWITHAES128CBCSHA256, TLSRSAWITHAES128GCMSHA256, TLSRSAWITHAES256CBCSHA, TLSRSAWITHAES256CBCSHA256, TLSRSAWITHAES256GCMSHA384}
+}
+
 // ApplicationGatewaySslPolicyName enumerates the values for application gateway ssl policy name.
 type ApplicationGatewaySslPolicyName string
 
@@ -206,6 +256,11 @@ const (
 	AppGwSslPolicy20170401S ApplicationGatewaySslPolicyName = "AppGwSslPolicy20170401S"
 )
 
+// PossibleApplicationGatewaySslPolicyNameValues returns an array of possible values for the ApplicationGatewaySslPolicyName const type.
+func PossibleApplicationGatewaySslPolicyNameValues() [3]ApplicationGatewaySslPolicyName {
+	return [3]ApplicationGatewaySslPolicyName{AppGwSslPolicy20150501, AppGwSslPolicy20170401, AppGwSslPolicy20170401S}
+}
+
 // ApplicationGatewaySslPolicyType enumerates the values for application gateway ssl policy type.
 type ApplicationGatewaySslPolicyType string
 
@@ -216,6 +271,11 @@ const (
 	Predefined ApplicationGatewaySslPolicyType = "Predefined"
 )
 
+// PossibleApplicationGatewaySslPolicyTypeValues returns an array of possible values for the ApplicationGatewaySslPolicyType const type.
+func PossibleApplicationGatewaySslPolicyTypeValues() [2]ApplicationGatewaySslPolicyType {
+	return [2]ApplicationGatewaySslPolicyType{Custom, Predefined}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -228,6 +288,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -238,6 +303,11 @@ const (
 	WAF ApplicationGatewayTier = "WAF"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [2]ApplicationGatewayTier {
+	return [2]ApplicationGatewayTier{Standard, WAF}
+}
+
 // AssociationType enumerates the values for association type.
 type AssociationType string
 
@@ -248,6 +318,11 @@ const (
 	Contains AssociationType = "Contains"
 )
 
+// PossibleAssociationTypeValues returns an array of possible values for the AssociationType const type.
+func PossibleAssociationTypeValues() [2]AssociationType {
+	return [2]AssociationType{Associated, Contains}
+}
+
 // AuthenticationMethod enumerates the values for authentication method.
 type AuthenticationMethod string
 
@@ -258,6 +333,11 @@ const (
 	EAPTLS AuthenticationMethod = "EAPTLS"
 )
 
+// PossibleAuthenticationMethodValues returns an array of possible values for the AuthenticationMethod const type.
+func PossibleAuthenticationMethodValues() [2]AuthenticationMethod {
+	return [2]AuthenticationMethod{EAPMSCHAPv2, EAPTLS}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -268,6 +348,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // BgpPeerState enumerates the values for bgp peer state.
 type BgpPeerState string
 
@@ -284,6 +369,11 @@ const (
 	BgpPeerStateUnknown BgpPeerState = "Unknown"
 )
 
+// PossibleBgpPeerStateValues returns an array of possible values for the BgpPeerState const type.
+func PossibleBgpPeerStateValues() [5]BgpPeerState {
+	return [5]BgpPeerState{BgpPeerStateConnected, BgpPeerStateConnecting, BgpPeerStateIdle, BgpPeerStateStopped, BgpPeerStateUnknown}
+}
+
 // ConnectionStatus enumerates the values for connection status.
 type ConnectionStatus string
 
@@ -298,6 +388,11 @@ const (
 	ConnectionStatusUnknown ConnectionStatus = "Unknown"
 )
 
+// PossibleConnectionStatusValues returns an array of possible values for the ConnectionStatus const type.
+func PossibleConnectionStatusValues() [4]ConnectionStatus {
+	return [4]ConnectionStatus{ConnectionStatusConnected, ConnectionStatusDegraded, ConnectionStatusDisconnected, ConnectionStatusUnknown}
+}
+
 // DhGroup enumerates the values for dh group.
 type DhGroup string
 
@@ -320,6 +415,11 @@ const (
 	None DhGroup = "None"
 )
 
+// PossibleDhGroupValues returns an array of possible values for the DhGroup const type.
+func PossibleDhGroupValues() [8]DhGroup {
+	return [8]DhGroup{DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+}
+
 // Direction enumerates the values for direction.
 type Direction string
 
@@ -330,6 +430,11 @@ const (
 	Outbound Direction = "Outbound"
 )
 
+// PossibleDirectionValues returns an array of possible values for the Direction const type.
+func PossibleDirectionValues() [2]Direction {
+	return [2]Direction{Inbound, Outbound}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -344,6 +449,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -354,6 +464,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // EffectiveSecurityRuleProtocol enumerates the values for effective security rule protocol.
 type EffectiveSecurityRuleProtocol string
 
@@ -366,6 +481,11 @@ const (
 	UDP EffectiveSecurityRuleProtocol = "Udp"
 )
 
+// PossibleEffectiveSecurityRuleProtocolValues returns an array of possible values for the EffectiveSecurityRuleProtocol const type.
+func PossibleEffectiveSecurityRuleProtocolValues() [3]EffectiveSecurityRuleProtocol {
+	return [3]EffectiveSecurityRuleProtocol{All, TCP, UDP}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -381,6 +501,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -391,6 +516,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -403,6 +533,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -413,6 +548,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -425,6 +565,11 @@ const (
 	ExpressRouteCircuitSkuTierTransport ExpressRouteCircuitSkuTier = "Transport"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [3]ExpressRouteCircuitSkuTier {
+	return [3]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard, ExpressRouteCircuitSkuTierTransport}
+}
+
 // IkeEncryption enumerates the values for ike encryption.
 type IkeEncryption string
 
@@ -441,6 +586,11 @@ const (
 	DES3 IkeEncryption = "DES3"
 )
 
+// PossibleIkeEncryptionValues returns an array of possible values for the IkeEncryption const type.
+func PossibleIkeEncryptionValues() [5]IkeEncryption {
+	return [5]IkeEncryption{AES128, AES192, AES256, DES, DES3}
+}
+
 // IkeIntegrity enumerates the values for ike integrity.
 type IkeIntegrity string
 
@@ -455,6 +605,11 @@ const (
 	SHA384 IkeIntegrity = "SHA384"
 )
 
+// PossibleIkeIntegrityValues returns an array of possible values for the IkeIntegrity const type.
+func PossibleIkeIntegrityValues() [4]IkeIntegrity {
+	return [4]IkeIntegrity{MD5, SHA1, SHA256, SHA384}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -465,6 +620,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IpsecEncryption enumerates the values for ipsec encryption.
 type IpsecEncryption string
 
@@ -489,6 +649,11 @@ const (
 	IpsecEncryptionNone IpsecEncryption = "None"
 )
 
+// PossibleIpsecEncryptionValues returns an array of possible values for the IpsecEncryption const type.
+func PossibleIpsecEncryptionValues() [9]IpsecEncryption {
+	return [9]IpsecEncryption{IpsecEncryptionAES128, IpsecEncryptionAES192, IpsecEncryptionAES256, IpsecEncryptionDES, IpsecEncryptionDES3, IpsecEncryptionGCMAES128, IpsecEncryptionGCMAES192, IpsecEncryptionGCMAES256, IpsecEncryptionNone}
+}
+
 // IpsecIntegrity enumerates the values for ipsec integrity.
 type IpsecIntegrity string
 
@@ -507,6 +672,11 @@ const (
 	IpsecIntegritySHA256 IpsecIntegrity = "SHA256"
 )
 
+// PossibleIpsecIntegrityValues returns an array of possible values for the IpsecIntegrity const type.
+func PossibleIpsecIntegrityValues() [6]IpsecIntegrity {
+	return [6]IpsecIntegrity{IpsecIntegrityGCMAES128, IpsecIntegrityGCMAES192, IpsecIntegrityGCMAES256, IpsecIntegrityMD5, IpsecIntegritySHA1, IpsecIntegritySHA256}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -517,6 +687,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // IssueType enumerates the values for issue type.
 type IssueType string
 
@@ -541,6 +716,11 @@ const (
 	IssueTypeUserDefinedRoute IssueType = "UserDefinedRoute"
 )
 
+// PossibleIssueTypeValues returns an array of possible values for the IssueType const type.
+func PossibleIssueTypeValues() [9]IssueType {
+	return [9]IssueType{IssueTypeAgentStopped, IssueTypeDNSResolution, IssueTypeGuestFirewall, IssueTypeNetworkSecurityRule, IssueTypePlatform, IssueTypePortThrottled, IssueTypeSocketBind, IssueTypeUnknown, IssueTypeUserDefinedRoute}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -553,6 +733,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // NextHopType enumerates the values for next hop type.
 type NextHopType string
 
@@ -571,6 +756,11 @@ const (
 	NextHopTypeVnetLocal NextHopType = "VnetLocal"
 )
 
+// PossibleNextHopTypeValues returns an array of possible values for the NextHopType const type.
+func PossibleNextHopTypeValues() [6]NextHopType {
+	return [6]NextHopType{NextHopTypeHyperNetGateway, NextHopTypeInternet, NextHopTypeNone, NextHopTypeVirtualAppliance, NextHopTypeVirtualNetworkGateway, NextHopTypeVnetLocal}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -583,6 +773,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // Origin enumerates the values for origin.
 type Origin string
 
@@ -595,6 +790,11 @@ const (
 	OriginOutbound Origin = "Outbound"
 )
 
+// PossibleOriginValues returns an array of possible values for the Origin const type.
+func PossibleOriginValues() [3]Origin {
+	return [3]Origin{OriginInbound, OriginLocal, OriginOutbound}
+}
+
 // PcError enumerates the values for pc error.
 type PcError string
 
@@ -611,6 +811,11 @@ const (
 	StorageFailed PcError = "StorageFailed"
 )
 
+// PossiblePcErrorValues returns an array of possible values for the PcError const type.
+func PossiblePcErrorValues() [5]PcError {
+	return [5]PcError{AgentStopped, CaptureFailed, InternalError, LocalFileFailed, StorageFailed}
+}
+
 // PcProtocol enumerates the values for pc protocol.
 type PcProtocol string
 
@@ -623,6 +828,11 @@ const (
 	PcProtocolUDP PcProtocol = "UDP"
 )
 
+// PossiblePcProtocolValues returns an array of possible values for the PcProtocol const type.
+func PossiblePcProtocolValues() [3]PcProtocol {
+	return [3]PcProtocol{PcProtocolAny, PcProtocolTCP, PcProtocolUDP}
+}
+
 // PcStatus enumerates the values for pc status.
 type PcStatus string
 
@@ -639,6 +849,11 @@ const (
 	PcStatusUnknown PcStatus = "Unknown"
 )
 
+// PossiblePcStatusValues returns an array of possible values for the PcStatus const type.
+func PossiblePcStatusValues() [5]PcStatus {
+	return [5]PcStatus{PcStatusError, PcStatusNotStarted, PcStatusRunning, PcStatusStopped, PcStatusUnknown}
+}
+
 // PfsGroup enumerates the values for pfs group.
 type PfsGroup string
 
@@ -659,6 +874,11 @@ const (
 	PfsGroupPFS24 PfsGroup = "PFS24"
 )
 
+// PossiblePfsGroupValues returns an array of possible values for the PfsGroup const type.
+func PossiblePfsGroupValues() [7]PfsGroup {
+	return [7]PfsGroup{PfsGroupECP256, PfsGroupECP384, PfsGroupNone, PfsGroupPFS1, PfsGroupPFS2, PfsGroupPFS2048, PfsGroupPFS24}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -669,6 +889,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -679,6 +904,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // Protocol enumerates the values for protocol.
 type Protocol string
 
@@ -689,6 +919,11 @@ const (
 	ProtocolUDP Protocol = "UDP"
 )
 
+// PossibleProtocolValues returns an array of possible values for the Protocol const type.
+func PossibleProtocolValues() [2]Protocol {
+	return [2]Protocol{ProtocolTCP, ProtocolUDP}
+}
+
 // ProvisioningState enumerates the values for provisioning state.
 type ProvisioningState string
 
@@ -703,6 +938,11 @@ const (
 	ProvisioningStateUpdating ProvisioningState = "Updating"
 )
 
+// PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type.
+func PossibleProvisioningStateValues() [4]ProvisioningState {
+	return [4]ProvisioningState{ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateSucceeded, ProvisioningStateUpdating}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -719,6 +959,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -729,6 +974,11 @@ const (
 	SecurityRuleAccessDeny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{SecurityRuleAccessAllow, SecurityRuleAccessDeny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -739,6 +989,11 @@ const (
 	SecurityRuleDirectionOutbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{SecurityRuleDirectionInbound, SecurityRuleDirectionOutbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -751,6 +1006,11 @@ const (
 	SecurityRuleProtocolUDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{SecurityRuleProtocolAsterisk, SecurityRuleProtocolTCP, SecurityRuleProtocolUDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -765,6 +1025,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // Severity enumerates the values for severity.
 type Severity string
 
@@ -775,6 +1040,11 @@ const (
 	SeverityWarning Severity = "Warning"
 )
 
+// PossibleSeverityValues returns an array of possible values for the Severity const type.
+func PossibleSeverityValues() [2]Severity {
+	return [2]Severity{SeverityError, SeverityWarning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -785,6 +1055,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [2]TransportProtocol {
+	return [2]TransportProtocol{TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -799,6 +1074,11 @@ const (
 	VirtualNetworkGatewayConnectionStatusUnknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{VirtualNetworkGatewayConnectionStatusConnected, VirtualNetworkGatewayConnectionStatusConnecting, VirtualNetworkGatewayConnectionStatusNotConnected, VirtualNetworkGatewayConnectionStatusUnknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -813,6 +1093,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -833,6 +1118,11 @@ const (
 	VirtualNetworkGatewaySkuNameVpnGw3 VirtualNetworkGatewaySkuName = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [7]VirtualNetworkGatewaySkuName {
+	return [7]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance, VirtualNetworkGatewaySkuNameVpnGw1, VirtualNetworkGatewaySkuNameVpnGw2, VirtualNetworkGatewaySkuNameVpnGw3}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -853,6 +1143,11 @@ const (
 	VirtualNetworkGatewaySkuTierVpnGw3 VirtualNetworkGatewaySkuTier = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [7]VirtualNetworkGatewaySkuTier {
+	return [7]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance, VirtualNetworkGatewaySkuTierVpnGw1, VirtualNetworkGatewaySkuTierVpnGw2, VirtualNetworkGatewaySkuTierVpnGw3}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -863,6 +1158,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -875,6 +1175,11 @@ const (
 	Initiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{Connected, Disconnected, Initiated}
+}
+
 // VpnClientProtocol enumerates the values for vpn client protocol.
 type VpnClientProtocol string
 
@@ -885,6 +1190,11 @@ const (
 	SSTP VpnClientProtocol = "SSTP"
 )
 
+// PossibleVpnClientProtocolValues returns an array of possible values for the VpnClientProtocol const type.
+func PossibleVpnClientProtocolValues() [2]VpnClientProtocol {
+	return [2]VpnClientProtocol{IkeV2, SSTP}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -895,6 +1205,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
@@ -2586,29 +2901,29 @@ type ApplicationGatewayRequestRoutingRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// ApplicationGatewaysBackendHealthFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupBackendHealthFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysBackendHealthFuture struct {
+type ApplicationGatewaysGroupBackendHealthFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGatewaysClient) (agbh ApplicationGatewayBackendHealth, err error) {
+func (future ApplicationGatewaysGroupBackendHealthFuture) Result(client ApplicationGatewaysGroupClient) (agbh ApplicationGatewayBackendHealth, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysBackendHealthFuture")
+		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupBackendHealthFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		agbh, err = client.BackendHealthResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2625,39 +2940,39 @@ func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGa
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	agbh, err = client.BackendHealthResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysCreateOrUpdateFuture struct {
+type ApplicationGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) {
+func (future ApplicationGatewaysGroupCreateOrUpdateFuture) Result(client ApplicationGatewaysGroupClient) (ag ApplicationGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysCreateOrUpdateFuture")
+		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ag, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2674,39 +2989,39 @@ func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationG
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ag, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ApplicationGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ApplicationGatewaysDeleteFuture struct {
+type ApplicationGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
+func (future ApplicationGatewaysGroupDeleteFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2723,12 +3038,110 @@ func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStartFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStartFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStartFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStartFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StartResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StartResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStopFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStopFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStopFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StopResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StopResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -2902,104 +3315,6 @@ type ApplicationGatewaySslPredefinedPolicyPropertiesFormat struct {
 	MinProtocolVersion ApplicationGatewaySslProtocol `json:"minProtocolVersion,omitempty"`
 }
 
-// ApplicationGatewaysStartFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStartFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStartFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StartResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StartResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
-// ApplicationGatewaysStopFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStopFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStopFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StopResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StopResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
 // ApplicationGatewayURLPathMap urlPathMaps give a url path to the backend mapping information for
 // PathBasedRouting.
 type ApplicationGatewayURLPathMap struct {
@@ -4121,29 +4436,29 @@ func (erca *ExpressRouteCircuitAuthorization) UnmarshalJSON(body []byte) error {
 	return nil
 }
 
-// ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results
-// of a long-running operation.
-type ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (erca ExpressRouteCircuitAuthorization, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (erca ExpressRouteCircuitAuthorization, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture")
+		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erca, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4160,39 +4475,39 @@ func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(clien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erca, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitAuthorizationsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitAuthorizationsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitAuthorizationsDeleteFuture struct {
+type ExpressRouteCircuitAuthorizationsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4209,12 +4524,12 @@ func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client Expres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -4542,29 +4857,29 @@ type ExpressRouteCircuitPeeringPropertiesFormat struct {
 	Ipv6PeeringConfig *Ipv6ExpressRouteCircuitPeeringConfig `json:"ipv6PeeringConfig,omitempty"`
 }
 
-// ExpressRouteCircuitPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitPeeringsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsClient) (ercp ExpressRouteCircuitPeering, err error) {
+func (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ercp ExpressRouteCircuitPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture")
+		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4581,39 +4896,39 @@ func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client Expr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitPeeringsDeleteFuture struct {
+type ExpressRouteCircuitPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRouteCircuitPeeringsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitPeeringsGroupDeleteFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4630,12 +4945,12 @@ func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRoute
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -4701,29 +5016,39 @@ type ExpressRouteCircuitsArpTableListResult struct {
 	NextLink *string `json:"nextLink,omitempty"`
 }
 
-// ExpressRouteCircuitsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
+type ExpressRouteCircuitServiceProviderProperties struct {
+	// ServiceProviderName - The serviceProviderName.
+	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
+	// PeeringLocation - The peering location.
+	PeeringLocation *string `json:"peeringLocation,omitempty"`
+	// BandwidthInMbps - The BandwidthInMbps.
+	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
+}
+
+// ExpressRouteCircuitsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsCreateOrUpdateFuture struct {
+type ExpressRouteCircuitsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) {
+func (future ExpressRouteCircuitsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitsGroupClient) (erc ExpressRouteCircuit, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsCreateOrUpdateFuture")
+		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4740,39 +5065,39 @@ func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRout
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ExpressRouteCircuitsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ExpressRouteCircuitsDeleteFuture struct {
+type ExpressRouteCircuitsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuitsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitsGroupDeleteFuture) Result(client ExpressRouteCircuitsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4789,59 +5114,39 @@ func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuit
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
-type ExpressRouteCircuitServiceProviderProperties struct {
-	// ServiceProviderName - The serviceProviderName.
-	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
-	// PeeringLocation - The peering location.
-	PeeringLocation *string `json:"peeringLocation,omitempty"`
-	// BandwidthInMbps - The BandwidthInMbps.
-	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
-}
-
-// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
-type ExpressRouteCircuitSku struct {
-	// Name - The name of the SKU.
-	Name *string `json:"name,omitempty"`
-	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium', 'ExpressRouteCircuitSkuTierTransport'
-	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
-	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
-	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
-}
-
-// ExpressRouteCircuitsListArpTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListArpTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListArpTableFuture struct {
+type ExpressRouteCircuitsGroupListArpTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteCircuitsClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListArpTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListArpTableFuture")
+		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListArpTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercatlr, err = client.ListArpTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4858,39 +5163,39 @@ func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercatlr, err = client.ListArpTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListRoutesTableFuture struct {
+type ExpressRouteCircuitsGroupListRoutesTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRouteCircuitsClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableFuture")
+		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtlr, err = client.ListRoutesTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4907,39 +5212,39 @@ func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtlr, err = client.ListRoutesTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitsListRoutesTableSummaryFuture struct {
+// ExpressRouteCircuitsGroupListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type ExpressRouteCircuitsGroupListRoutesTableSummaryFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableSummaryFuture")
+		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtslr, err = client.ListRoutesTableSummaryResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4956,16 +5261,26 @@ func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client Exp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtslr, err = client.ListRoutesTableSummaryResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
+type ExpressRouteCircuitSku struct {
+	// Name - The name of the SKU.
+	Name *string `json:"name,omitempty"`
+	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium', 'ExpressRouteCircuitSkuTierTransport'
+	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
+	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
+	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
+}
+
 // ExpressRouteCircuitsRoutesTableListResult response for ListRoutesTable associated with the Express Route
 // Circuits API.
 type ExpressRouteCircuitsRoutesTableListResult struct {
@@ -5672,29 +5987,29 @@ type InboundNatRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InboundNatRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type InboundNatRulesCreateOrUpdateFuture struct {
+// InboundNatRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type InboundNatRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesClient) (inr InboundNatRule, err error) {
+func (future InboundNatRulesGroupCreateOrUpdateFuture) Result(client InboundNatRulesGroupClient) (inr InboundNatRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesCreateOrUpdateFuture")
+		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		inr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5711,39 +6026,39 @@ func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	inr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InboundNatRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// InboundNatRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InboundNatRulesDeleteFuture struct {
+type InboundNatRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (ar autorest.Response, err error) {
+func (future InboundNatRulesGroupDeleteFuture) Result(client InboundNatRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5760,12 +6075,12 @@ func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -6335,29 +6650,29 @@ type InterfacePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InterfacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// InterfacesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InterfacesCreateOrUpdateFuture struct {
+type InterfacesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i Interface, err error) {
+func (future InterfacesGroupCreateOrUpdateFuture) Result(client InterfacesGroupClient) (i Interface, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return i, azure.NewAsyncOpIncompleteError("network.InterfacesCreateOrUpdateFuture")
+		return i, azure.NewAsyncOpIncompleteError("network.InterfacesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		i, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6374,38 +6689,39 @@ func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	i, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type InterfacesDeleteFuture struct {
+// InterfacesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type InterfacesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autorest.Response, err error) {
+func (future InterfacesGroupDeleteFuture) Result(client InterfacesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6422,39 +6738,39 @@ func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autores
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
+// InterfacesGroupGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type InterfacesGetEffectiveRouteTableFuture struct {
+type InterfacesGroupGetEffectiveRouteTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesClient) (erlr EffectiveRouteListResult, err error) {
+func (future InterfacesGroupGetEffectiveRouteTableFuture) Result(client InterfacesGroupClient) (erlr EffectiveRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGetEffectiveRouteTableFuture")
+		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupGetEffectiveRouteTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erlr, err = client.GetEffectiveRouteTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6471,39 +6787,39 @@ func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erlr, err = client.GetEffectiveRouteTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type InterfacesListEffectiveNetworkSecurityGroupsFuture struct {
+// InterfacesGroupListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type InterfacesGroupListEffectiveNetworkSecurityGroupsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
+func (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesGroupClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesListEffectiveNetworkSecurityGroupsFuture")
+		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6520,12 +6836,12 @@ func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client I
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -7309,29 +7625,29 @@ type LoadBalancerPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LoadBalancersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type LoadBalancersCreateOrUpdateFuture struct {
+// LoadBalancersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type LoadBalancersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) {
+func (future LoadBalancersGroupCreateOrUpdateFuture) Result(client LoadBalancersGroupClient) (lb LoadBalancer, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersCreateOrUpdateFuture")
+		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lb, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7348,38 +7664,39 @@ func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lb, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LoadBalancersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type LoadBalancersDeleteFuture struct {
+// LoadBalancersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type LoadBalancersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar autorest.Response, err error) {
+func (future LoadBalancersGroupDeleteFuture) Result(client LoadBalancersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7396,12 +7713,12 @@ func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -7734,29 +8051,29 @@ type LocalNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LocalNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// LocalNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type LocalNetworkGatewaysCreateOrUpdateFuture struct {
+type LocalNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) {
+func (future LocalNetworkGatewaysGroupCreateOrUpdateFuture) Result(client LocalNetworkGatewaysGroupClient) (lng LocalNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysCreateOrUpdateFuture")
+		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7773,39 +8090,39 @@ func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetwor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LocalNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// LocalNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type LocalNetworkGatewaysDeleteFuture struct {
+type LocalNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future LocalNetworkGatewaysGroupDeleteFuture) Result(client LocalNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7822,12 +8139,12 @@ func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGateway
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -8089,28 +8406,29 @@ type PacketCaptureResultProperties struct {
 	Filters            *[]PacketCaptureFilter        `json:"filters,omitempty"`
 }
 
-// PacketCapturesCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesCreateFuture struct {
+// PacketCapturesGroupCreateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupCreateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pcr PacketCaptureResult, err error) {
+func (future PacketCapturesGroupCreateFuture) Result(client PacketCapturesGroupClient) (pcr PacketCaptureResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesCreateFuture")
+		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupCreateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcr, err = client.CreateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8127,38 +8445,39 @@ func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pc
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcr, err = client.CreateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesDeleteFuture struct {
+// PacketCapturesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupDeleteFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8175,39 +8494,39 @@ func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// PacketCapturesGroupGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PacketCapturesGetStatusFuture struct {
+type PacketCapturesGroupGetStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
+func (future PacketCapturesGroupGetStatusFuture) Result(client PacketCapturesGroupClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGetStatusFuture")
+		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupGetStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcqsr, err = client.GetStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8224,38 +8543,39 @@ func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcqsr, err = client.GetStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesStopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesStopFuture struct {
+// PacketCapturesGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupStopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupStopFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesStopFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupStopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8272,12 +8592,12 @@ func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -8724,29 +9044,29 @@ type PublicIPAddressDNSSettings struct {
 	ReverseFqdn *string `json:"reverseFqdn,omitempty"`
 }
 
-// PublicIPAddressesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type PublicIPAddressesCreateOrUpdateFuture struct {
+// PublicIPAddressesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type PublicIPAddressesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) {
+func (future PublicIPAddressesGroupCreateOrUpdateFuture) Result(client PublicIPAddressesGroupClient) (pia PublicIPAddress, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesCreateOrUpdateFuture")
+		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pia, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8763,39 +9083,39 @@ func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pia, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PublicIPAddressesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// PublicIPAddressesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PublicIPAddressesDeleteFuture struct {
+type PublicIPAddressesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClient) (ar autorest.Response, err error) {
+func (future PublicIPAddressesGroupDeleteFuture) Result(client PublicIPAddressesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8812,12 +9132,12 @@ func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -9588,29 +9908,29 @@ type RouteFilterRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteFilterRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type RouteFilterRulesCreateOrUpdateFuture struct {
+// RouteFilterRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type RouteFilterRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupCreateOrUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesCreateOrUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9627,39 +9947,39 @@ func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRule
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesDeleteFuture struct {
+type RouteFilterRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) (ar autorest.Response, err error) {
+func (future RouteFilterRulesGroupDeleteFuture) Result(client RouteFilterRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9676,39 +9996,39 @@ func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesUpdateFuture struct {
+type RouteFilterRulesGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9725,39 +10045,39 @@ func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFiltersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFiltersCreateOrUpdateFuture struct {
+type RouteFiltersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupCreateOrUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersCreateOrUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9774,38 +10094,39 @@ func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersDeleteFuture struct {
+// RouteFiltersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar autorest.Response, err error) {
+func (future RouteFiltersGroupDeleteFuture) Result(client RouteFiltersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9822,38 +10143,39 @@ func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar aut
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersUpdateFuture struct {
+// RouteFiltersGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9870,12 +10192,12 @@ func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf Rou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -9994,28 +10316,29 @@ type RoutePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RoutesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesCreateOrUpdateFuture struct {
+// RoutesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RoutesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, err error) {
+func (future RoutesGroupCreateOrUpdateFuture) Result(client RoutesGroupClient) (r Route, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return r, azure.NewAsyncOpIncompleteError("network.RoutesCreateOrUpdateFuture")
+		return r, azure.NewAsyncOpIncompleteError("network.RoutesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		r, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10032,38 +10355,38 @@ func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, e
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	r, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RoutesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesDeleteFuture struct {
+// RoutesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type RoutesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Response, err error) {
+func (future RoutesGroupDeleteFuture) Result(client RoutesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RoutesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RoutesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10080,12 +10403,12 @@ func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Respon
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10326,29 +10649,29 @@ type RouteTablePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteTablesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteTablesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteTablesCreateOrUpdateFuture struct {
+type RouteTablesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (rt RouteTable, err error) {
+func (future RouteTablesGroupCreateOrUpdateFuture) Result(client RouteTablesGroupClient) (rt RouteTable, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesCreateOrUpdateFuture")
+		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rt, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10365,38 +10688,39 @@ func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rt, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteTablesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteTablesDeleteFuture struct {
+// RouteTablesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteTablesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autorest.Response, err error) {
+func (future RouteTablesGroupDeleteFuture) Result(client RouteTablesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10413,12 +10737,12 @@ func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10672,29 +10996,29 @@ type SecurityGroupPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityGroupsCreateOrUpdateFuture struct {
+// SecurityGroupsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityGroupsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) {
+func (future SecurityGroupsGroupCreateOrUpdateFuture) Result(client SecurityGroupsGroupClient) (sg SecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsCreateOrUpdateFuture")
+		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sg, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10711,38 +11035,39 @@ func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sg, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityGroupsDeleteFuture struct {
+// SecurityGroupsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityGroupsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar autorest.Response, err error) {
+func (future SecurityGroupsGroupDeleteFuture) Result(client SecurityGroupsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10759,12 +11084,12 @@ func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10991,29 +11316,29 @@ type SecurityRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityRulesCreateOrUpdateFuture struct {
+// SecurityRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClient) (sr SecurityRule, err error) {
+func (future SecurityRulesGroupCreateOrUpdateFuture) Result(client SecurityRulesGroupClient) (sr SecurityRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesCreateOrUpdateFuture")
+		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11030,38 +11355,39 @@ func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityRulesDeleteFuture struct {
+// SecurityRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar autorest.Response, err error) {
+func (future SecurityRulesGroupDeleteFuture) Result(client SecurityRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11078,12 +11404,12 @@ func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11296,29 +11622,29 @@ type SubnetPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SubnetsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// SubnetsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type SubnetsCreateOrUpdateFuture struct {
+type SubnetsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet, err error) {
+func (future SubnetsGroupCreateOrUpdateFuture) Result(client SubnetsGroupClient) (s Subnet, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.SubnetsCreateOrUpdateFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.SubnetsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11335,38 +11661,38 @@ func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SubnetsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SubnetsDeleteFuture struct {
+// SubnetsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type SubnetsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Response, err error) {
+func (future SubnetsGroupDeleteFuture) Result(client SubnetsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11383,12 +11709,12 @@ func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Resp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12371,29 +12697,29 @@ type VirtualNetworkGatewayConnectionPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewayConnectionsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsCreateOrUpdateFuture struct {
+// VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngc VirtualNetworkGatewayConnection, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (vngc VirtualNetworkGatewayConnection, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture")
+		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vngc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12410,39 +12736,39 @@ func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vngc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewayConnectionsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewayConnectionsDeleteFuture struct {
+type VirtualNetworkGatewayConnectionsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client VirtualNetworkGatewayConnectionsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupDeleteFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12459,39 +12785,39 @@ func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsResetSharedKeyFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsResetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (crsk ConnectionResetSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (crsk ConnectionResetSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture")
+		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		crsk, err = client.ResetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12508,39 +12834,39 @@ func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	crsk, err = client.ResetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsSetSharedKeyFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewayConnectionsSetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (csk ConnectionSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (csk ConnectionSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture")
+		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		csk, err = client.SetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12557,12 +12883,12 @@ func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client V
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	csk, err = client.SetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12875,29 +13201,29 @@ type VirtualNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysCreateOrUpdateFuture struct {
+type VirtualNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysCreateOrUpdateFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12914,39 +13240,39 @@ func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysDeleteFuture struct {
+// VirtualNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewaysGroupDeleteFuture) Result(client VirtualNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12963,39 +13289,39 @@ func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGat
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewaysGeneratevpnclientpackageFuture struct {
+// VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GeneratevpnclientpackageResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13012,39 +13338,39 @@ func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GeneratevpnclientpackageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGenerateVpnProfileFuture struct {
+// VirtualNetworkGatewaysGroupGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGenerateVpnProfileFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGenerateVpnProfileFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GenerateVpnProfileResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13061,39 +13387,39 @@ func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client Virtu
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GenerateVpnProfileResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGetAdvertisedRoutesFuture struct {
+// VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetAdvertisedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13110,39 +13436,39 @@ func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client Virt
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetAdvertisedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetBgpPeerStatusFuture struct {
+type VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysClient) (bpslr BgpPeerStatusListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysGroupClient) (bpslr BgpPeerStatusListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetBgpPeerStatusFuture")
+		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		bpslr, err = client.GetBgpPeerStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13159,39 +13485,39 @@ func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	bpslr, err = client.GetBgpPeerStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetLearnedRoutesFuture struct {
+type VirtualNetworkGatewaysGroupGetLearnedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetLearnedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetLearnedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13208,49 +13534,39 @@ func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetLearnedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
-type VirtualNetworkGatewaySku struct {
-	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
-	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
-	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
-	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
-	// Capacity - The capacity.
-	Capacity *int32 `json:"capacity,omitempty"`
-}
-
-// VirtualNetworkGatewaysResetFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysResetFuture struct {
+// VirtualNetworkGatewaysGroupResetFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupResetFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupResetFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysResetFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupResetFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.ResetResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13267,16 +13583,26 @@ func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGate
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.ResetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
+type VirtualNetworkGatewaySku struct {
+	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
+	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
+	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
+	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
+	// Capacity - The capacity.
+	Capacity *int32 `json:"capacity,omitempty"`
+}
+
 // VirtualNetworkListResult response for the ListVirtualNetworks API service call.
 type VirtualNetworkListResult struct {
 	autorest.Response `json:"-"`
@@ -13666,29 +13992,29 @@ type VirtualNetworkPeeringPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkPeeringsCreateOrUpdateFuture struct {
+type VirtualNetworkPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsClient) (vnp VirtualNetworkPeering, err error) {
+func (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsGroupClient) (vnp VirtualNetworkPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsCreateOrUpdateFuture")
+		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vnp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13705,39 +14031,39 @@ func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vnp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkPeeringsDeleteFuture struct {
+// VirtualNetworkPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPeeringsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkPeeringsGroupDeleteFuture) Result(client VirtualNetworkPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13754,12 +14080,12 @@ func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPee
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -13780,29 +14106,29 @@ type VirtualNetworkPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworksCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworksCreateOrUpdateFuture struct {
+// VirtualNetworksGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworksGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) {
+func (future VirtualNetworksGroupCreateOrUpdateFuture) Result(client VirtualNetworksGroupClient) (vn VirtualNetwork, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksCreateOrUpdateFuture")
+		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vn, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13819,39 +14145,39 @@ func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vn, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworksDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// VirtualNetworksGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type VirtualNetworksDeleteFuture struct {
+type VirtualNetworksGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (ar autorest.Response, err error) {
+func (future VirtualNetworksGroupDeleteFuture) Result(client VirtualNetworksGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13868,12 +14194,12 @@ func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -14206,29 +14532,29 @@ type WatcherPropertiesFormat struct {
 	ProvisioningState ProvisioningState `json:"provisioningState,omitempty"`
 }
 
-// WatchersCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersCheckConnectivityFuture struct {
+type WatchersGroupCheckConnectivityFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci ConnectivityInformation, err error) {
+func (future WatchersGroupCheckConnectivityFuture) Result(client WatchersGroupClient) (ci ConnectivityInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ci, azure.NewAsyncOpIncompleteError("network.WatchersCheckConnectivityFuture")
+		return ci, azure.NewAsyncOpIncompleteError("network.WatchersGroupCheckConnectivityFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ci, err = client.CheckConnectivityResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14245,38 +14571,38 @@ func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ci, err = client.CheckConnectivityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersDeleteFuture struct {
+// WatchersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type WatchersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Response, err error) {
+func (future WatchersGroupDeleteFuture) Result(client WatchersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.WatchersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.WatchersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14293,39 +14619,39 @@ func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Re
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetFlowLogStatusFuture struct {
+type WatchersGroupGetFlowLogStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupGetFlowLogStatusFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGetFlowLogStatusFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetFlowLogStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.GetFlowLogStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14342,38 +14668,39 @@ func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.GetFlowLogStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersGetNextHopFuture struct {
+// WatchersGroupGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupGetNextHopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHopResult, err error) {
+func (future WatchersGroupGetNextHopFuture) Result(client WatchersGroupClient) (nhr NextHopResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGetNextHopFuture")
+		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetNextHopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		nhr, err = client.GetNextHopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14390,39 +14717,39 @@ func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHo
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	nhr, err = client.GetNextHopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetTroubleshootingFuture struct {
+type WatchersGroupGetTroubleshootingFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14439,39 +14766,39 @@ func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
+// WatchersGroupGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type WatchersGetTroubleshootingResultFuture struct {
+type WatchersGroupGetTroubleshootingResultFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingResultFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingResultFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingResultFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResultResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14488,39 +14815,39 @@ func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResultResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetVMSecurityRulesFuture struct {
+type WatchersGroupGetVMSecurityRulesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sgvr SecurityGroupViewResult, err error) {
+func (future WatchersGroupGetVMSecurityRulesFuture) Result(client WatchersGroupClient) (sgvr SecurityGroupViewResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGetVMSecurityRulesFuture")
+		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetVMSecurityRulesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sgvr, err = client.GetVMSecurityRulesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14537,39 +14864,39 @@ func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sg
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sgvr, err = client.GetVMSecurityRulesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type WatchersSetFlowLogConfigurationFuture struct {
+// WatchersGroupSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type WatchersGroupSetFlowLogConfigurationFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupSetFlowLogConfigurationFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersSetFlowLogConfigurationFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupSetFlowLogConfigurationFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.SetFlowLogConfigurationResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14586,38 +14913,39 @@ func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.SetFlowLogConfigurationResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersVerifyIPFlowFuture struct {
+// WatchersGroupVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupVerifyIPFlowFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr VerificationIPFlowResult, err error) {
+func (future WatchersGroupVerifyIPFlowFuture) Result(client WatchersGroupClient) (vifr VerificationIPFlowResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersVerifyIPFlowFuture")
+		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersGroupVerifyIPFlowFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vifr, err = client.VerifyIPFlowResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14634,12 +14962,12 @@ func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr Ver
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vifr, err = client.VerifyIPFlowResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/packetcaptures.go b/services/network/mgmt/2017-06-01/network/packetcapturesgroup.go
similarity index 71%
rename from services/network/mgmt/2017-06-01/network/packetcaptures.go
rename to services/network/mgmt/2017-06-01/network/packetcapturesgroup.go
index 95b6b9658f90..3b3b524b59c3 100644
--- a/services/network/mgmt/2017-06-01/network/packetcaptures.go
+++ b/services/network/mgmt/2017-06-01/network/packetcapturesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// PacketCapturesClient is the network Client
-type PacketCapturesClient struct {
+// PacketCapturesGroupClient is the network Client
+type PacketCapturesGroupClient struct {
 	BaseClient
 }
 
-// NewPacketCapturesClient creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
-	return NewPacketCapturesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPacketCapturesGroupClient creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClient(subscriptionID string) PacketCapturesGroupClient {
+	return NewPacketCapturesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPacketCapturesClientWithBaseURI creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
-	return PacketCapturesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPacketCapturesGroupClientWithBaseURI creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesGroupClient {
+	return PacketCapturesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Create create and start a packet capture on the specified VM.
@@ -45,25 +45,25 @@ func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) P
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session. parameters is parameters that define the create
 // packet capture operation.
-func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesGroupCreateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PacketCaptureParameters", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.PacketCaptureParameters.Target", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "parameters.PacketCaptureParameters.StorageLocation", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PacketCapturesClient", "Create", err.Error())
+		return result, validation.NewError("network.PacketCapturesGroupClient", "Create", err.Error())
 	}
 
 	req, err := client.CreatePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName
 }
 
 // CreatePreparer prepares the Create request.
-func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
+func (client PacketCapturesGroupClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -96,7 +96,7 @@ func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceG
 
 // CreateSender sends the Create request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) CreateSender(req *http.Request) (future PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) CreateSender(req *http.Request) (future PacketCapturesGroupCreateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PacketCapturesClient) CreateSender(req *http.Request) (future Packe
 
 // CreateResponder handles the response to the Create request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -166,7 +166,7 @@ func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) DeleteSender(req *http.Request) (future PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) DeleteSender(req *http.Request) (future PacketCapturesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client PacketCapturesClient) DeleteSender(req *http.Request) (future Packe
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -241,14 +241,14 @@ func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -263,16 +263,16 @@ func (client PacketCapturesClient) GetResponder(resp *http.Response) (result Pac
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource. packetCaptureName is the name given to the packet capture session.
-func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupGetStatusFuture, err error) {
 	req, err := client.GetStatusPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -280,7 +280,7 @@ func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupN
 }
 
 // GetStatusPreparer prepares the GetStatus request.
-func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -303,7 +303,7 @@ func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resour
 
 // GetStatusSender sends the GetStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatusSender(req *http.Request) (future PacketCapturesGroupGetStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -318,7 +318,7 @@ func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future Pa
 
 // GetStatusResponder handles the response to the GetStatus request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
+func (client PacketCapturesGroupClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource.
-func (client PacketCapturesClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -378,14 +378,14 @@ func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -400,16 +400,16 @@ func (client PacketCapturesClient) ListResponder(resp *http.Response) (result Pa
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -417,7 +417,7 @@ func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName s
 }
 
 // StopPreparer prepares the Stop request.
-func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -440,7 +440,7 @@ func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGro
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) StopSender(req *http.Request) (future PacketCapturesGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -455,7 +455,7 @@ func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketC
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-06-01/network/publicipaddresses.go b/services/network/mgmt/2017-06-01/network/publicipaddressesgroup.go
similarity index 70%
rename from services/network/mgmt/2017-06-01/network/publicipaddresses.go
rename to services/network/mgmt/2017-06-01/network/publicipaddressesgroup.go
index 12e6bbe891a3..f77f72631846 100644
--- a/services/network/mgmt/2017-06-01/network/publicipaddresses.go
+++ b/services/network/mgmt/2017-06-01/network/publicipaddressesgroup.go
@@ -25,26 +25,26 @@ import (
 	"net/http"
 )
 
-// PublicIPAddressesClient is the network Client
-type PublicIPAddressesClient struct {
+// PublicIPAddressesGroupClient is the network Client
+type PublicIPAddressesGroupClient struct {
 	BaseClient
 }
 
-// NewPublicIPAddressesClient creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
-	return NewPublicIPAddressesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPublicIPAddressesGroupClient creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClient(subscriptionID string) PublicIPAddressesGroupClient {
+	return NewPublicIPAddressesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPublicIPAddressesClientWithBaseURI creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
-	return PublicIPAddressesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPublicIPAddressesGroupClientWithBaseURI creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesGroupClient {
+	return PublicIPAddressesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a static or dynamic public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address.
 // parameters is parameters supplied to the create or update public IP address operation.
-func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat", Name: validation.Null, Rule: false,
@@ -53,18 +53,18 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 						Chain: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat.IPConfiguration.IPConfigurationPropertiesFormat.PublicIPAddress", Name: validation.Null, Rule: false, Chain: nil}}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PublicIPAddressesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.PublicIPAddressesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, publicIPAddressName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -72,7 +72,7 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -96,7 +96,7 @@ func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (f
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -125,16 +125,16 @@ func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Respons
 // Delete deletes the specified public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet.
-func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, publicIPAddressName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -142,7 +142,7 @@ func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupN
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -164,7 +164,7 @@ func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resour
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) DeleteSender(req *http.Request) (future PublicIPAddressesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -179,7 +179,7 @@ func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future Pu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PublicIPAddressesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -193,30 +193,30 @@ func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet. expand is
 // expands referenced resources.
-func (client PublicIPAddressesClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -241,14 +241,14 @@ func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceG
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -265,30 +265,30 @@ func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. IPConfigurationName is the name of the IP configuration. publicIPAddressName is the name of
 // the public IP Address. expand is expands referenced resources.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetPublicIPAddressSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetPublicIPAddressResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressPreparer prepares the GetVirtualMachineScaleSetPublicIPAddress request.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -317,14 +317,14 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPr
 
 // GetVirtualMachineScaleSetPublicIPAddressSender sends the GetVirtualMachineScaleSetPublicIPAddress request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressResponder handles the response to the GetVirtualMachineScaleSetPublicIPAddress request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -338,31 +338,31 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressRe
 // List gets all public IP addresses in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client PublicIPAddressesClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -383,14 +383,14 @@ func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resource
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -402,10 +402,10 @@ func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -413,47 +413,47 @@ func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddres
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the public IP addresses in a subscription.
-func (client PublicIPAddressesClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -473,14 +473,14 @@ func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*htt
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -492,10 +492,10 @@ func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (res
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -503,17 +503,17 @@ func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAdd
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -523,31 +523,31 @@ func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (resu
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -569,14 +569,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 
 // ListVirtualMachineScaleSetPublicIPAddressesSender sends the ListVirtualMachineScaleSetPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -588,10 +588,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 }
 
 // listVirtualMachineScaleSetPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -599,17 +599,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddresse
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -620,31 +620,31 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the network
 // interface name. IPConfigurationName is the IP configuration name.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetVMPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -669,14 +669,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesSender sends the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -688,10 +688,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 }
 
 // listVirtualMachineScaleSetVMPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -699,17 +699,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddres
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/routefilterrules.go b/services/network/mgmt/2017-06-01/network/routefilterrulesgroup.go
similarity index 72%
rename from services/network/mgmt/2017-06-01/network/routefilterrules.go
rename to services/network/mgmt/2017-06-01/network/routefilterrulesgroup.go
index 12117142f2f3..5f52de7c5544 100644
--- a/services/network/mgmt/2017-06-01/network/routefilterrules.go
+++ b/services/network/mgmt/2017-06-01/network/routefilterrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// RouteFilterRulesClient is the network Client
-type RouteFilterRulesClient struct {
+// RouteFilterRulesGroupClient is the network Client
+type RouteFilterRulesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFilterRulesClient creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClient(subscriptionID string) RouteFilterRulesClient {
-	return NewRouteFilterRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFilterRulesGroupClient creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClient(subscriptionID string) RouteFilterRulesGroupClient {
+	return NewRouteFilterRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFilterRulesClientWithBaseURI creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesClient {
-	return RouteFilterRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFilterRulesGroupClientWithBaseURI creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesGroupClient {
+	return RouteFilterRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route filter.
@@ -45,25 +45,25 @@ func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the create or update
 // route filter rule operation.
-func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: routeFilterRuleParameters,
 			Constraints: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.RouteFilterRuleType", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.Communities", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.RouteFilterRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.RouteFilterRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourc
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -96,7 +96,7 @@ func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (fu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupNa
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -166,7 +166,7 @@ func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourc
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) DeleteSender(req *http.Request) (future RouteFilterRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future Rou
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFilterRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (resul
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -241,14 +241,14 @@ func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGr
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -262,31 +262,31 @@ func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result R
 // ListByRouteFilter gets all RouteFilterRules in a route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFilterRulesClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
 	result.fn = client.listByRouteFilterNextResults
 	req, err := client.ListByRouteFilterPreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.rfrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure sending request")
 		return
 	}
 
 	result.rfrlr, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByRouteFilterPreparer prepares the ListByRouteFilter request.
-func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -308,14 +308,14 @@ func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Conte
 
 // ListByRouteFilterSender sends the ListByRouteFilter request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByRouteFilterResponder handles the response to the ListByRouteFilter request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -327,10 +327,10 @@ func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Respo
 }
 
 // listByRouteFilterNextResults retrieves the next set of results, if any.
-func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
 	req, err := lastResults.routeFilterRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -338,17 +338,17 @@ func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults Ro
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByRouteFilterComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
 	result.page, err = client.ListByRouteFilter(ctx, resourceGroupName, routeFilterName)
 	return
 }
@@ -358,16 +358,16 @@ func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Conte
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the update route
 // filter rule operation.
-func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -375,7 +375,7 @@ func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupNa
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -400,7 +400,7 @@ func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourc
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) UpdateSender(req *http.Request) (future RouteFilterRulesGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -415,7 +415,7 @@ func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future Rou
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-06-01/network/routefilters.go b/services/network/mgmt/2017-06-01/network/routefiltersgroup.go
similarity index 66%
rename from services/network/mgmt/2017-06-01/network/routefilters.go
rename to services/network/mgmt/2017-06-01/network/routefiltersgroup.go
index 2de46fe981bb..aea6980806ef 100644
--- a/services/network/mgmt/2017-06-01/network/routefilters.go
+++ b/services/network/mgmt/2017-06-01/network/routefiltersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteFiltersClient is the network Client
-type RouteFiltersClient struct {
+// RouteFiltersGroupClient is the network Client
+type RouteFiltersGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFiltersClient creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
-	return NewRouteFiltersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFiltersGroupClient creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClient(subscriptionID string) RouteFiltersGroupClient {
+	return NewRouteFiltersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFiltersClientWithBaseURI creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
-	return RouteFiltersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFiltersGroupClientWithBaseURI creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersGroupClient {
+	return RouteFiltersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route filter in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the create or update route filter operation.
-func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGro
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -84,7 +84,7 @@ func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, res
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (r
 // Delete deletes the specified route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName s
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -152,7 +152,7 @@ func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGro
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) DeleteSender(req *http.Request) (future RouteFiltersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFiltersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result au
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. expand is
 // expands referenced express route bgp peering resources.
-func (client RouteFiltersClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -229,14 +229,14 @@ func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupN
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -248,31 +248,31 @@ func (client RouteFiltersClient) GetResponder(resp *http.Response) (result Route
 }
 
 // List gets all route filters in a subscription.
-func (client RouteFiltersClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -292,14 +292,14 @@ func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Reques
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -311,10 +311,10 @@ func (client RouteFiltersClient) ListResponder(resp *http.Response) (result Rout
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -322,17 +322,17 @@ func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResu
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
@@ -340,31 +340,31 @@ func (client RouteFiltersClient) ListComplete(ctx context.Context) (result Route
 // ListByResourceGroup gets all route filters in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteFiltersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listByResourceGroupNextResults
 	req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByResourceGroupPreparer prepares the ListByResourceGroup request.
-func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -385,14 +385,14 @@ func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context
 
 // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Respons
 }
 
 // listByResourceGroupNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults Rout
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.ListByResourceGroup(ctx, resourceGroupName)
 	return
 }
@@ -434,16 +434,16 @@ func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the update route filter operation.
-func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName s
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -475,7 +475,7 @@ func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGro
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) UpdateSender(req *http.Request) (future RouteFiltersGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFi
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-06-01/network/routes.go b/services/network/mgmt/2017-06-01/network/routesgroup.go
similarity index 69%
rename from services/network/mgmt/2017-06-01/network/routes.go
rename to services/network/mgmt/2017-06-01/network/routesgroup.go
index b45421abda5d..dfa7a01f02d1 100644
--- a/services/network/mgmt/2017-06-01/network/routes.go
+++ b/services/network/mgmt/2017-06-01/network/routesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RoutesClient is the network Client
-type RoutesClient struct {
+// RoutesGroupClient is the network Client
+type RoutesGroupClient struct {
 	BaseClient
 }
 
-// NewRoutesClient creates an instance of the RoutesClient client.
-func NewRoutesClient(subscriptionID string) RoutesClient {
-	return NewRoutesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRoutesGroupClient creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClient(subscriptionID string) RoutesGroupClient {
+	return NewRoutesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRoutesClientWithBaseURI creates an instance of the RoutesClient client.
-func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
-	return RoutesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRoutesGroupClientWithBaseURI creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClientWithBaseURI(baseURI string, subscriptionID string) RoutesGroupClient {
+	return RoutesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route. routeParameters is parameters supplied to the create or update route operation.
-func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, routeName, routeParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
+func (client RoutesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -85,7 +85,7 @@ func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceG
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdateSender(req *http.Request) (future RoutesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -100,7 +100,7 @@ func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future Route
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -115,16 +115,16 @@ func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -132,7 +132,7 @@ func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -155,7 +155,7 @@ func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) DeleteSender(req *http.Request) (future RoutesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -170,7 +170,7 @@ func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteF
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RoutesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -184,30 +184,30 @@ func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
+func (client RoutesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -230,14 +230,14 @@ func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName st
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) GetResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err
 // List gets all routes in a route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RoutesClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
+func (client RoutesGroupClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RoutesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -297,14 +297,14 @@ func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName s
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
+func (client RoutesGroupClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -316,10 +316,10 @@ func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListR
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RoutesClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
+func (client RoutesGroupClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
 	req, err := lastResults.routeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -327,17 +327,17 @@ func (client RoutesClient) listNextResults(lastResults RouteListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RoutesClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
+func (client RoutesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, routeTableName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/routetables.go b/services/network/mgmt/2017-06-01/network/routetablesgroup.go
similarity index 65%
rename from services/network/mgmt/2017-06-01/network/routetables.go
rename to services/network/mgmt/2017-06-01/network/routetablesgroup.go
index 9ebf10f285e0..d112f3ac8da3 100644
--- a/services/network/mgmt/2017-06-01/network/routetables.go
+++ b/services/network/mgmt/2017-06-01/network/routetablesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteTablesClient is the network Client
-type RouteTablesClient struct {
+// RouteTablesGroupClient is the network Client
+type RouteTablesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteTablesClient creates an instance of the RouteTablesClient client.
-func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
-	return NewRouteTablesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteTablesGroupClient creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClient(subscriptionID string) RouteTablesGroupClient {
+	return NewRouteTablesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteTablesClientWithBaseURI creates an instance of the RouteTablesClient client.
-func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
-	return RouteTablesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteTablesGroupClientWithBaseURI creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesGroupClient {
+	return RouteTablesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate create or updates a route table in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters
 // is parameters supplied to the create or update route table operation.
-func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGrou
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
+func (client RouteTablesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -84,7 +84,7 @@ func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, reso
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (re
 // Delete deletes the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName st
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -152,7 +152,7 @@ func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGrou
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) DeleteSender(req *http.Request) (future RouteTablesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTab
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteTablesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result aut
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. expand is
 // expands referenced resources.
-func (client RouteTablesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
+func (client RouteTablesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -229,14 +229,14 @@ func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupNa
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteT
 // List gets all route tables in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteTablesClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupN
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client RouteTablesClient) ListResponder(resp *http.Response) (result Route
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all route tables in a subscription.
-func (client RouteTablesClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Requ
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result Ro
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListRes
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/securitygroups.go b/services/network/mgmt/2017-06-01/network/securitygroupsgroup.go
similarity index 65%
rename from services/network/mgmt/2017-06-01/network/securitygroups.go
rename to services/network/mgmt/2017-06-01/network/securitygroupsgroup.go
index d761ad89bfcb..e8cbd2e60643 100644
--- a/services/network/mgmt/2017-06-01/network/securitygroups.go
+++ b/services/network/mgmt/2017-06-01/network/securitygroupsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// SecurityGroupsClient is the network Client
-type SecurityGroupsClient struct {
+// SecurityGroupsGroupClient is the network Client
+type SecurityGroupsGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityGroupsClient creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
-	return NewSecurityGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityGroupsGroupClient creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClient(subscriptionID string) SecurityGroupsGroupClient {
+	return NewSecurityGroupsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityGroupsClientWithBaseURI creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
-	return SecurityGroupsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityGroupsGroupClientWithBaseURI creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsGroupClient {
+	return SecurityGroupsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network security group in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. parameters is parameters supplied to the create or update network security group operation.
-func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceG
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (futu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -114,16 +114,16 @@ func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -131,7 +131,7 @@ func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -153,7 +153,7 @@ func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) DeleteSender(req *http.Request) (future SecurityGroupsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -168,7 +168,7 @@ func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future Secur
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityGroupsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -182,30 +182,30 @@ func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. expand is expands referenced resources.
-func (client SecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -230,14 +230,14 @@ func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result Sec
 // List gets all network security groups in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client SecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -296,14 +296,14 @@ func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -315,10 +315,10 @@ func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result Se
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -326,47 +326,47 @@ func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupList
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network security groups in a subscription.
-func (client SecurityGroupsClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -386,14 +386,14 @@ func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.R
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -405,10 +405,10 @@ func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -416,17 +416,17 @@ func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupL
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/securityrules.go b/services/network/mgmt/2017-06-01/network/securityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-06-01/network/securityrules.go
rename to services/network/mgmt/2017-06-01/network/securityrulesgroup.go
index 69d53ee2606b..49dad125a40c 100644
--- a/services/network/mgmt/2017-06-01/network/securityrules.go
+++ b/services/network/mgmt/2017-06-01/network/securityrulesgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SecurityRulesClient is the network Client
-type SecurityRulesClient struct {
+// SecurityRulesGroupClient is the network Client
+type SecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityRulesClient creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
-	return NewSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityRulesGroupClient creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClient(subscriptionID string) SecurityRulesGroupClient {
+	return NewSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityRulesClientWithBaseURI creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
-	return SecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityRulesGroupClientWithBaseURI creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesGroupClient {
+	return SecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a security rule in the specified network security group.
@@ -44,16 +44,16 @@ func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) Se
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule. securityRuleParameters is parameters supplied
 // to the create or update network security rule operation.
-func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
+func (client SecurityRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -156,7 +156,7 @@ func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) DeleteSender(req *http.Request) (future SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) DeleteSender(req *http.Request) (future SecurityRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SecurityRulesClient) DeleteSender(req *http.Request) (future Securi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -231,14 +231,14 @@ func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -253,31 +253,31 @@ func (client SecurityRulesClient) GetResponder(resp *http.Response) (result Secu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client SecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -299,14 +299,14 @@ func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -318,10 +318,10 @@ func (client SecurityRulesClient) ListResponder(resp *http.Response) (result Sec
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -329,17 +329,17 @@ func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client SecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/subnets.go b/services/network/mgmt/2017-06-01/network/subnetsgroup.go
similarity index 69%
rename from services/network/mgmt/2017-06-01/network/subnets.go
rename to services/network/mgmt/2017-06-01/network/subnetsgroup.go
index 091962b35786..156b659311fe 100644
--- a/services/network/mgmt/2017-06-01/network/subnets.go
+++ b/services/network/mgmt/2017-06-01/network/subnetsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SubnetsClient is the network Client
-type SubnetsClient struct {
+// SubnetsGroupClient is the network Client
+type SubnetsGroupClient struct {
 	BaseClient
 }
 
-// NewSubnetsClient creates an instance of the SubnetsClient client.
-func NewSubnetsClient(subscriptionID string) SubnetsClient {
-	return NewSubnetsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSubnetsGroupClient creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClient(subscriptionID string) SubnetsGroupClient {
+	return NewSubnetsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSubnetsClientWithBaseURI creates an instance of the SubnetsClient client.
-func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
-	return SubnetsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSubnetsGroupClientWithBaseURI creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClientWithBaseURI(baseURI string, subscriptionID string) SubnetsGroupClient {
+	return SubnetsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a subnet in the specified virtual network.
@@ -44,16 +44,16 @@ func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsC
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. subnetParameters is parameters supplied to the create or update subnet
 // operation.
-func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, subnetParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupNam
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
+func (client SubnetsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -86,7 +86,7 @@ func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resource
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateSender(req *http.Request) (future SubnetsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future Subn
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet.
-func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
+func (client SubnetsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -156,7 +156,7 @@ func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupNam
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) DeleteSender(req *http.Request) (future SubnetsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDelet
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SubnetsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autores
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. expand is expands referenced resources.
-func (client SubnetsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
+func (client SubnetsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
+func (client SubnetsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -234,14 +234,14 @@ func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName s
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) GetResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -255,31 +255,31 @@ func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, er
 // List gets all subnets in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client SubnetsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
+func (client SubnetsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.slr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.slr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client SubnetsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -301,14 +301,14 @@ func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,10 +320,10 @@ func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetLis
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
 	req, err := lastResults.subnetListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -331,17 +331,17 @@ func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (resul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SubnetsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
+func (client SubnetsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/usages.go b/services/network/mgmt/2017-06-01/network/usagesgroup.go
similarity index 64%
rename from services/network/mgmt/2017-06-01/network/usages.go
rename to services/network/mgmt/2017-06-01/network/usagesgroup.go
index 429b5cb8f1e8..07e2c4938298 100644
--- a/services/network/mgmt/2017-06-01/network/usages.go
+++ b/services/network/mgmt/2017-06-01/network/usagesgroup.go
@@ -25,55 +25,55 @@ import (
 	"net/http"
 )
 
-// UsagesClient is the network Client
-type UsagesClient struct {
+// UsagesGroupClient is the network Client
+type UsagesGroupClient struct {
 	BaseClient
 }
 
-// NewUsagesClient creates an instance of the UsagesClient client.
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return NewUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewUsagesGroupClient creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClient(subscriptionID string) UsagesGroupClient {
+	return NewUsagesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewUsagesClientWithBaseURI creates an instance of the UsagesClient client.
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return UsagesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewUsagesGroupClientWithBaseURI creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClientWithBaseURI(baseURI string, subscriptionID string) UsagesGroupClient {
+	return UsagesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List lists compute usages for a subscription.
 //
 // location is the location where resource usage is queried.
-func (client UsagesClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
+func (client UsagesGroupClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: location,
 			Constraints: []validation.Constraint{{Target: "location", Name: validation.Pattern, Rule: `^[-\w\._]+$`, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.UsagesClient", "List", err.Error())
+		return result, validation.NewError("network.UsagesGroupClient", "List", err.Error())
 	}
 
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ulr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ulr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client UsagesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -94,14 +94,14 @@ func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client UsagesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client UsagesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,10 +113,10 @@ func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesList
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
 	req, err := lastResults.usagesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -124,17 +124,17 @@ func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client UsagesClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
+func (client UsagesGroupClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/version.go b/services/network/mgmt/2017-06-01/network/version.go
index d55ca42b056c..63850a4b2460 100644
--- a/services/network/mgmt/2017-06-01/network/version.go
+++ b/services/network/mgmt/2017-06-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2017-06-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2017-06-01/network/virtualnetworkgatewayconnections.go b/services/network/mgmt/2017-06-01/network/virtualnetworkgatewayconnectionsgroup.go
similarity index 71%
rename from services/network/mgmt/2017-06-01/network/virtualnetworkgatewayconnections.go
rename to services/network/mgmt/2017-06-01/network/virtualnetworkgatewayconnectionsgroup.go
index 8f4af9c490b0..32ee547a9e8e 100644
--- a/services/network/mgmt/2017-06-01/network/virtualnetworkgatewayconnections.go
+++ b/services/network/mgmt/2017-06-01/network/virtualnetworkgatewayconnectionsgroup.go
@@ -25,20 +25,21 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewayConnectionsClient is the network Client
-type VirtualNetworkGatewayConnectionsClient struct {
+// VirtualNetworkGatewayConnectionsGroupClient is the network Client
+type VirtualNetworkGatewayConnectionsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewayConnectionsClient creates an instance of the VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return NewVirtualNetworkGatewayConnectionsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewayConnectionsGroupClient creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClient(subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewayConnectionsClientWithBaseURI creates an instance of the
-// VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return VirtualNetworkGatewayConnectionsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return VirtualNetworkGatewayConnectionsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway connection in the specified resource group.
@@ -46,7 +47,7 @@ func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscr
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection. parameters is parameters supplied to the create or update virtual network
 // gateway connection operation.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat", Name: validation.Null, Rule: true,
@@ -57,18 +58,18 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 					{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2", Name: validation.Null, Rule: false,
 						Chain: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -76,7 +77,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -100,7 +101,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -115,7 +116,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *h
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -130,16 +131,16 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -147,7 +148,7 @@ func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -169,7 +170,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +185,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Requ
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -198,30 +199,30 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -243,14 +244,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Con
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -266,30 +267,30 @@ func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection shared key name.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
 	req, err := client.GetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSharedKeySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSharedKeyPreparer prepares the GetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -311,14 +312,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx co
 
 // GetSharedKeySender sends the GetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSharedKeyResponder handles the response to the GetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,31 +334,31 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp
 // created.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewayConnectionsClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vngclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vngclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -378,14 +379,14 @@ func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Co
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -397,10 +398,10 @@ func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayConnectionListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -408,17 +409,17 @@ func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -430,25 +431,25 @@ func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Co
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection reset shared key Name. parameters is parameters supplied to the begin reset virtual network
 // gateway connection shared key operation through network resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.InclusiveMaximum, Rule: 128, Chain: nil},
 					{Target: "parameters.KeyLength", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", err.Error())
 	}
 
 	req, err := client.ResetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -456,7 +457,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.
 }
 
 // ResetSharedKeyPreparer prepares the ResetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -480,7 +481,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx
 
 // ResetSharedKeySender sends the ResetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -495,7 +496,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *h
 
 // ResetSharedKeyResponder handles the response to the ResetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -513,22 +514,22 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection name. parameters is parameters supplied to the Begin Set Virtual Network Gateway connection
 // Shared key operation throughNetwork resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Value", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", err.Error())
 	}
 
 	req, err := client.SetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -536,7 +537,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Co
 }
 
 // SetSharedKeyPreparer prepares the SetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -560,7 +561,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx co
 
 // SetSharedKeySender sends the SetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -575,7 +576,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *htt
 
 // SetSharedKeyResponder handles the response to the SetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-06-01/network/virtualnetworkgateways.go b/services/network/mgmt/2017-06-01/network/virtualnetworkgatewaysgroup.go
similarity index 72%
rename from services/network/mgmt/2017-06-01/network/virtualnetworkgateways.go
rename to services/network/mgmt/2017-06-01/network/virtualnetworkgatewaysgroup.go
index ca1efc090321..84cf1386105b 100644
--- a/services/network/mgmt/2017-06-01/network/virtualnetworkgateways.go
+++ b/services/network/mgmt/2017-06-01/network/virtualnetworkgatewaysgroup.go
@@ -25,41 +25,41 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewaysClient is the network Client
-type VirtualNetworkGatewaysClient struct {
+// VirtualNetworkGatewaysGroupClient is the network Client
+type VirtualNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewaysClient creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClient(subscriptionID string) VirtualNetworkGatewaysClient {
-	return NewVirtualNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewaysGroupClient creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClient(subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return NewVirtualNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewaysClientWithBaseURI creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysClient {
-	return VirtualNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewaysGroupClientWithBaseURI creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return VirtualNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to create or update virtual network gateway operation.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -67,7 +67,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -91,7 +91,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -106,7 +106,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -121,16 +121,16 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -138,7 +138,7 @@ func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -160,7 +160,7 @@ func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -175,7 +175,7 @@ func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -191,16 +191,16 @@ func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response)
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	req, err := client.GeneratevpnclientpackagePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GeneratevpnclientpackageSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -208,7 +208,7 @@ func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.
 }
 
 // GeneratevpnclientpackagePreparer prepares the Generatevpnclientpackage request.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -232,7 +232,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx
 
 // GeneratevpnclientpackageSender sends the Generatevpnclientpackage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -247,7 +247,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *h
 
 // GeneratevpnclientpackageResponder handles the response to the Generatevpnclientpackage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -264,16 +264,16 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	req, err := client.GenerateVpnProfilePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GenerateVpnProfileSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -281,7 +281,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Contex
 }
 
 // GenerateVpnProfilePreparer prepares the GenerateVpnProfile request.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -305,7 +305,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx contex
 
 // GenerateVpnProfileSender sends the GenerateVpnProfile request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -320,7 +320,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Re
 
 // GenerateVpnProfileResponder handles the response to the GenerateVpnProfile request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -335,30 +335,30 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *htt
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -380,14 +380,14 @@ func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -403,16 +403,16 @@ func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	req, err := client.GetAdvertisedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetAdvertisedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -420,7 +420,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Conte
 }
 
 // GetAdvertisedRoutesPreparer prepares the GetAdvertisedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -443,7 +443,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx conte
 
 // GetAdvertisedRoutesSender sends the GetAdvertisedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -458,7 +458,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.R
 
 // GetAdvertisedRoutesResponder handles the response to the GetAdvertisedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -473,16 +473,16 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer to retrieve the status of.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	req, err := client.GetBgpPeerStatusPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetBgpPeerStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -490,7 +490,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context,
 }
 
 // GetBgpPeerStatusPreparer prepares the GetBgpPeerStatus request.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -515,7 +515,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.
 
 // GetBgpPeerStatusSender sends the GetBgpPeerStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -530,7 +530,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Requ
 
 // GetBgpPeerStatusResponder handles the response to the GetBgpPeerStatus request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -546,16 +546,16 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	req, err := client.GetLearnedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetLearnedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -563,7 +563,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context,
 }
 
 // GetLearnedRoutesPreparer prepares the GetLearnedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -585,7 +585,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.
 
 // GetLearnedRoutesSender sends the GetLearnedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -600,7 +600,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Requ
 
 // GetLearnedRoutesResponder handles the response to the GetLearnedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -614,31 +614,31 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.
 // List gets all virtual network gateways by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -659,14 +659,14 @@ func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -678,10 +678,10 @@ func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -689,17 +689,17 @@ func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -708,31 +708,31 @@ func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
 	result.fn = client.listConnectionsNextResults
 	req, err := client.ListConnectionsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.vnglcr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglcr, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListConnectionsPreparer prepares the ListConnections request.
-func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -754,14 +754,14 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.C
 
 // ListConnectionsSender sends the ListConnections request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListConnectionsResponder handles the response to the ListConnections request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -773,10 +773,10 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.R
 }
 
 // listConnectionsNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListConnectionsResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -784,17 +784,17 @@ func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResult
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListConnectionsComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
 	result.page, err = client.ListConnections(ctx, resourceGroupName, virtualNetworkGatewayName)
 	return
 }
@@ -804,16 +804,16 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.C
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. gatewayVip is virtual network gateway vip address supplied to the begin reset of the
 // active-active feature enabled gateway.
-func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysGroupResetFuture, err error) {
 	req, err := client.ResetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, gatewayVip)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -821,7 +821,7 @@ func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGr
 }
 
 // ResetPreparer prepares the Reset request.
-func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -846,7 +846,7 @@ func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, re
 
 // ResetSender sends the Reset request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysGroupResetFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -861,7 +861,7 @@ func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (futur
 
 // ResetResponder handles the response to the Reset request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-06-01/network/virtualnetworkpeerings.go b/services/network/mgmt/2017-06-01/network/virtualnetworkpeeringsgroup.go
similarity index 70%
rename from services/network/mgmt/2017-06-01/network/virtualnetworkpeerings.go
rename to services/network/mgmt/2017-06-01/network/virtualnetworkpeeringsgroup.go
index a419f8d61139..3cb81e9aecbf 100644
--- a/services/network/mgmt/2017-06-01/network/virtualnetworkpeerings.go
+++ b/services/network/mgmt/2017-06-01/network/virtualnetworkpeeringsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkPeeringsClient is the network Client
-type VirtualNetworkPeeringsClient struct {
+// VirtualNetworkPeeringsGroupClient is the network Client
+type VirtualNetworkPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkPeeringsClient creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
-	return NewVirtualNetworkPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkPeeringsGroupClient creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClient(subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return NewVirtualNetworkPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkPeeringsClientWithBaseURI creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
-	return VirtualNetworkPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkPeeringsGroupClientWithBaseURI creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return VirtualNetworkPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified virtual network.
@@ -44,16 +44,16 @@ func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID s
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the peering. virtualNetworkPeeringParameters is parameters supplied to
 // the create or update virtual network peering operation.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -86,7 +86,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -156,7 +156,7 @@ func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -231,14 +231,14 @@ func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +252,31 @@ func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (re
 // List gets all virtual network peerings in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworkPeeringsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
+func (client VirtualNetworkPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -298,14 +298,14 @@ func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +317,10 @@ func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
 	req, err := lastResults.virtualNetworkPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +328,17 @@ func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/virtualnetworks.go b/services/network/mgmt/2017-06-01/network/virtualnetworksgroup.go
similarity index 70%
rename from services/network/mgmt/2017-06-01/network/virtualnetworks.go
rename to services/network/mgmt/2017-06-01/network/virtualnetworksgroup.go
index 2704b4f4561a..7d45913463fc 100644
--- a/services/network/mgmt/2017-06-01/network/virtualnetworks.go
+++ b/services/network/mgmt/2017-06-01/network/virtualnetworksgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// VirtualNetworksClient is the network Client
-type VirtualNetworksClient struct {
+// VirtualNetworksGroupClient is the network Client
+type VirtualNetworksGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworksClient creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return NewVirtualNetworksClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworksGroupClient creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClient(subscriptionID string) VirtualNetworksGroupClient {
+	return NewVirtualNetworksGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworksClientWithBaseURI creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return VirtualNetworksClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworksGroupClientWithBaseURI creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksGroupClient {
+	return VirtualNetworksGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckIPAddressAvailability checks whether a private IP address is available for use.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // IPAddress is the private IP address to be verified.
-func (client VirtualNetworksClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
 	req, err := client.CheckIPAddressAvailabilityPreparer(ctx, resourceGroupName, virtualNetworkName, IPAddress)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CheckIPAddressAvailabilitySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CheckIPAddressAvailabilityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CheckIPAddressAvailabilityPreparer prepares the CheckIPAddressAvailability request.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -91,14 +91,14 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx conte
 
 // CheckIPAddressAvailabilitySender sends the CheckIPAddressAvailability request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CheckIPAddressAvailabilityResponder handles the response to the CheckIPAddressAvailability request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // parameters is parameters supplied to the create or update virtual network operation
-func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -154,7 +154,7 @@ func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -169,7 +169,7 @@ func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -183,16 +183,16 @@ func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response)
 // Delete deletes the specified virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -200,7 +200,7 @@ func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -222,7 +222,7 @@ func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) DeleteSender(req *http.Request) (future VirtualNetworksGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -237,7 +237,7 @@ func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future Virt
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworksGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,30 +251,30 @@ func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // expand is expands referenced resources.
-func (client VirtualNetworksClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -299,14 +299,14 @@ func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,31 +320,31 @@ func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result Vi
 // List gets all virtual networks in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworksClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -365,14 +365,14 @@ func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -384,10 +384,10 @@ func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result V
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -395,47 +395,47 @@ func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all virtual networks in a subscription.
-func (client VirtualNetworksClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -455,14 +455,14 @@ func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -474,10 +474,10 @@ func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (resul
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -485,17 +485,17 @@ func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetwor
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -503,31 +503,31 @@ func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result
 // ListUsage lists usage stats.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
 	result.fn = client.listUsageNextResults
 	req, err := client.ListUsagePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.vnlur.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlur, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListUsagePreparer prepares the ListUsage request.
-func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -549,14 +549,14 @@ func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resou
 
 // ListUsageSender sends the ListUsage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListUsageSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListUsageSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListUsageResponder handles the response to the ListUsage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -568,10 +568,10 @@ func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (res
 }
 
 // listUsageNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
 	req, err := lastResults.virtualNetworkListUsageResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -579,17 +579,17 @@ func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetw
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListUsageComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
 	result.page, err = client.ListUsage(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-06-01/network/watchers.go b/services/network/mgmt/2017-06-01/network/watchersgroup.go
similarity index 71%
rename from services/network/mgmt/2017-06-01/network/watchers.go
rename to services/network/mgmt/2017-06-01/network/watchersgroup.go
index fbf66525fc58..174fa1f6e641 100644
--- a/services/network/mgmt/2017-06-01/network/watchers.go
+++ b/services/network/mgmt/2017-06-01/network/watchersgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// WatchersClient is the network Client
-type WatchersClient struct {
+// WatchersGroupClient is the network Client
+type WatchersGroupClient struct {
 	BaseClient
 }
 
-// NewWatchersClient creates an instance of the WatchersClient client.
-func NewWatchersClient(subscriptionID string) WatchersClient {
-	return NewWatchersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewWatchersGroupClient creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClient(subscriptionID string) WatchersGroupClient {
+	return NewWatchersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewWatchersClientWithBaseURI creates an instance of the WatchersClient client.
-func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) WatchersClient {
-	return WatchersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewWatchersGroupClientWithBaseURI creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClientWithBaseURI(baseURI string, subscriptionID string) WatchersGroupClient {
+	return WatchersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckConnectivity verifies the possibility of establishing a direct TCP connection from a virtual machine to a given
@@ -45,24 +45,24 @@ func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) Watcher
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that determine how the connectivity check will be performed.
-func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersGroupCheckConnectivityFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.Source.ResourceID", Name: validation.Null, Rule: true, Chain: nil}}},
 				{Target: "parameters.Destination", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "CheckConnectivity", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "CheckConnectivity", err.Error())
 	}
 
 	req, err := client.CheckConnectivityPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CheckConnectivitySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -70,7 +70,7 @@ func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGrou
 }
 
 // CheckConnectivityPreparer prepares the CheckConnectivity request.
-func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
+func (client WatchersGroupClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -94,7 +94,7 @@ func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, reso
 
 // CheckConnectivitySender sends the CheckConnectivity request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivitySender(req *http.Request) (future WatchersGroupCheckConnectivityFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -109,7 +109,7 @@ func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future
 
 // CheckConnectivityResponder handles the response to the CheckConnectivity request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
+func (client WatchersGroupClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -124,30 +124,30 @@ func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the network watcher resource.
-func (client WatchersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CreateOrUpdateSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
+func (client WatchersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -171,14 +171,14 @@ func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourc
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -192,16 +192,16 @@ func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (resul
 // Delete deletes the specified network watcher resource.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -209,7 +209,7 @@ func (client WatchersClient) Delete(ctx context.Context, resourceGroupName strin
 }
 
 // DeletePreparer prepares the Delete request.
-func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -231,7 +231,7 @@ func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupNa
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) DeleteSender(req *http.Request) (future WatchersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -246,7 +246,7 @@ func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDel
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client WatchersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -259,30 +259,30 @@ func (client WatchersClient) DeleteResponder(resp *http.Response) (result autore
 // Get gets the specified network watcher by resource group.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
+func (client WatchersGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -304,14 +304,14 @@ func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) GetResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -326,22 +326,22 @@ func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher,
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define a resource to query flow log status.
-func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGroupGetFlowLogStatusFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetFlowLogStatus", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetFlowLogStatus", err.Error())
 	}
 
 	req, err := client.GetFlowLogStatusPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetFlowLogStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -349,7 +349,7 @@ func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroup
 }
 
 // GetFlowLogStatusPreparer prepares the GetFlowLogStatus request.
-func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -373,7 +373,7 @@ func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resou
 
 // GetFlowLogStatusSender sends the GetFlowLogStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGroupGetFlowLogStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -388,7 +388,7 @@ func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future W
 
 // GetFlowLogStatusResponder handles the response to the GetFlowLogStatus request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -403,24 +403,24 @@ func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the source and destination endpoint.
-func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGroupGetNextHopFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.SourceIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.DestinationIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetNextHop", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetNextHop", err.Error())
 	}
 
 	req, err := client.GetNextHopPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetNextHopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -428,7 +428,7 @@ func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName s
 }
 
 // GetNextHopPreparer prepares the GetNextHop request.
-func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -452,7 +452,7 @@ func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGro
 
 // GetNextHopSender sends the GetNextHop request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetNextHopSender(req *http.Request) (future WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHopSender(req *http.Request) (future WatchersGroupGetNextHopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -467,7 +467,7 @@ func (client WatchersClient) GetNextHopSender(req *http.Request) (future Watcher
 
 // GetNextHopResponder handles the response to the GetNextHop request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
+func (client WatchersGroupClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -482,36 +482,36 @@ func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result Ne
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the representation of topology.
-func (client WatchersClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceGroupName", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTopology", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTopology", err.Error())
 	}
 
 	req, err := client.GetTopologyPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetTopologySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetTopologyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetTopologyPreparer prepares the GetTopology request.
-func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -535,14 +535,14 @@ func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGr
 
 // GetTopologySender sends the GetTopology request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTopologySender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetTopologySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetTopologyResponder handles the response to the GetTopology request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -557,7 +557,7 @@ func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result T
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to troubleshoot.
-func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGroupGetTroubleshootingFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -565,18 +565,18 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 					Chain: []validation.Constraint{{Target: "parameters.TroubleshootingProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.TroubleshootingProperties.StoragePath", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshooting", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshooting", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -584,7 +584,7 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 }
 
 // GetTroubleshootingPreparer prepares the GetTroubleshooting request.
-func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -608,7 +608,7 @@ func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, res
 
 // GetTroubleshootingSender sends the GetTroubleshooting request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingSender(req *http.Request) (future WatchersGroupGetTroubleshootingFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -623,7 +623,7 @@ func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future
 
 // GetTroubleshootingResponder handles the response to the GetTroubleshooting request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -638,22 +638,22 @@ func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to query the troubleshooting result.
-func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGroupGetTroubleshootingResultFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshootingResult", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshootingResult", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingResultPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingResultSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -661,7 +661,7 @@ func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resou
 }
 
 // GetTroubleshootingResultPreparer prepares the GetTroubleshootingResult request.
-func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -685,7 +685,7 @@ func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Contex
 
 // GetTroubleshootingResultSender sends the GetTroubleshootingResult request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGroupGetTroubleshootingResultFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -700,7 +700,7 @@ func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (
 
 // GetTroubleshootingResultResponder handles the response to the GetTroubleshootingResult request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -715,22 +715,22 @@ func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the VM to check security groups for.
-func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGroupGetVMSecurityRulesFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetVMSecurityRules", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetVMSecurityRules", err.Error())
 	}
 
 	req, err := client.GetVMSecurityRulesPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVMSecurityRulesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -738,7 +738,7 @@ func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGro
 }
 
 // GetVMSecurityRulesPreparer prepares the GetVMSecurityRules request.
-func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -762,7 +762,7 @@ func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, res
 
 // GetVMSecurityRulesSender sends the GetVMSecurityRules request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGroupGetVMSecurityRulesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -777,7 +777,7 @@ func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future
 
 // GetVMSecurityRulesResponder handles the response to the GetVMSecurityRules request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -791,30 +791,30 @@ func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (r
 // List gets all network watchers by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client WatchersClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client WatchersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -835,14 +835,14 @@ func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -854,30 +854,30 @@ func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherL
 }
 
 // ListAll gets all network watchers by subscription.
-func (client WatchersClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client WatchersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -897,14 +897,14 @@ func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -919,7 +919,7 @@ func (client WatchersClient) ListAllResponder(resp *http.Response) (result Watch
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define the configuration of flow log.
-func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -927,18 +927,18 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 					Chain: []validation.Constraint{{Target: "parameters.FlowLogProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.FlowLogProperties.Enabled", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "SetFlowLogConfiguration", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "SetFlowLogConfiguration", err.Error())
 	}
 
 	req, err := client.SetFlowLogConfigurationPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetFlowLogConfigurationSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -946,7 +946,7 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 }
 
 // SetFlowLogConfigurationPreparer prepares the SetFlowLogConfiguration request.
-func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -970,7 +970,7 @@ func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context
 
 // SetFlowLogConfigurationSender sends the SetFlowLogConfiguration request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -985,7 +985,7 @@ func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (f
 
 // SetFlowLogConfigurationResponder handles the response to the SetFlowLogConfiguration request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1000,7 +1000,7 @@ func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Respons
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the IP flow to be verified.
-func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersGroupVerifyIPFlowFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -1008,18 +1008,18 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 				{Target: "parameters.RemotePort", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.LocalIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.RemoteIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "VerifyIPFlow", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "VerifyIPFlow", err.Error())
 	}
 
 	req, err := client.VerifyIPFlowPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.VerifyIPFlowSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1027,7 +1027,7 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 }
 
 // VerifyIPFlowPreparer prepares the VerifyIPFlow request.
-func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
+func (client WatchersGroupClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1051,7 +1051,7 @@ func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceG
 
 // VerifyIPFlowSender sends the VerifyIPFlow request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlowSender(req *http.Request) (future WatchersGroupVerifyIPFlowFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1066,7 +1066,7 @@ func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future Watch
 
 // VerifyIPFlowResponder handles the response to the VerifyIPFlow request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
+func (client WatchersGroupClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-08-01/network/applicationgateways.go b/services/network/mgmt/2017-08-01/network/applicationgatewaysgroup.go
similarity index 70%
rename from services/network/mgmt/2017-08-01/network/applicationgateways.go
rename to services/network/mgmt/2017-08-01/network/applicationgatewaysgroup.go
index 3d07b80053ff..b4678a93b040 100644
--- a/services/network/mgmt/2017-08-01/network/applicationgateways.go
+++ b/services/network/mgmt/2017-08-01/network/applicationgatewaysgroup.go
@@ -25,35 +25,35 @@ import (
 	"net/http"
 )
 
-// ApplicationGatewaysClient is the network Client
-type ApplicationGatewaysClient struct {
+// ApplicationGatewaysGroupClient is the network Client
+type ApplicationGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewApplicationGatewaysClient creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
-	return NewApplicationGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewApplicationGatewaysGroupClient creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClient(subscriptionID string) ApplicationGatewaysGroupClient {
+	return NewApplicationGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewApplicationGatewaysClientWithBaseURI creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
-	return ApplicationGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewApplicationGatewaysGroupClientWithBaseURI creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysGroupClient {
+	return ApplicationGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // BackendHealth gets the backend health of the specified application gateway in a resource group.
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. expand is expands BackendAddressPool and BackendHttpSettings referenced in backend health.
-func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	req, err := client.BackendHealthPreparer(ctx, resourceGroupName, applicationGatewayName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.BackendHealthSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resou
 }
 
 // BackendHealthPreparer prepares the BackendHealth request.
-func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Contex
 
 // BackendHealthSender sends the BackendHealth request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (
 
 // BackendHealthResponder handles the response to the BackendHealth request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,7 +116,7 @@ func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. parameters is parameters supplied to the create or update application gateway operation.
-func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ApplicationGatewayPropertiesFormat", Name: validation.Null, Rule: false,
@@ -126,18 +126,18 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 						{Target: "parameters.ApplicationGatewayPropertiesFormat.WebApplicationFirewallConfiguration.RuleSetVersion", Name: validation.Null, Rule: true, Chain: nil},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ApplicationGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ApplicationGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -145,7 +145,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -169,7 +169,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +184,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -199,16 +199,16 @@ func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -216,7 +216,7 @@ func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGrou
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -238,7 +238,7 @@ func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, reso
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteSender(req *http.Request) (future ApplicationGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -253,7 +253,7 @@ func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -267,30 +267,30 @@ func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -312,14 +312,14 @@ func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourc
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (resul
 // GetSslPredefinedPolicy gets Ssl predefined policy with the specified policy name.
 //
 // predefinedPolicyName is name of Ssl predefined policy.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	req, err := client.GetSslPredefinedPolicyPreparer(ctx, predefinedPolicyName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSslPredefinedPolicySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSslPredefinedPolicyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSslPredefinedPolicyPreparer prepares the GetSslPredefinedPolicy request.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"predefinedPolicyName": autorest.Encode("path", predefinedPolicyName),
 		"subscriptionId":       autorest.Encode("path", client.SubscriptionID),
@@ -377,14 +377,14 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx conte
 
 // GetSslPredefinedPolicySender sends the GetSslPredefinedPolicy request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSslPredefinedPolicyResponder handles the response to the GetSslPredefinedPolicy request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -398,31 +398,31 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *ht
 // List lists all application gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ApplicationGatewaysClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -443,14 +443,14 @@ func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resour
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -462,10 +462,10 @@ func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (resu
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -473,47 +473,47 @@ func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationG
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the application gateways in a subscription.
-func (client ApplicationGatewaysClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -533,14 +533,14 @@ func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*h
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -552,10 +552,10 @@ func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (r
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -563,46 +563,46 @@ func (client ApplicationGatewaysClient) listAllNextResults(lastResults Applicati
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
 
 // ListAvailableSslOptions lists available Ssl options for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
 	req, err := client.ListAvailableSslOptionsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslOptionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableSslOptionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslOptionsPreparer prepares the ListAvailableSslOptions request.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -622,14 +622,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx cont
 
 // ListAvailableSslOptionsSender sends the ListAvailableSslOptions request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslOptionsResponder handles the response to the ListAvailableSslOptions request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -641,31 +641,31 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *h
 }
 
 // ListAvailableSslPredefinedPolicies lists all SSL predefined policies for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
 	result.fn = client.listAvailableSslPredefinedPoliciesNextResults
 	req, err := client.ListAvailableSslPredefinedPoliciesPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.agaspp.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
 		return
 	}
 
 	result.agaspp, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesPreparer prepares the ListAvailableSslPredefinedPolicies request.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -685,14 +685,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPrepar
 
 // ListAvailableSslPredefinedPoliciesSender sends the ListAvailableSslPredefinedPolicies request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslPredefinedPoliciesResponder handles the response to the ListAvailableSslPredefinedPolicies request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -704,10 +704,10 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesRespon
 }
 
 // listAvailableSslPredefinedPoliciesNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	req, err := lastResults.applicationGatewayAvailableSslPredefinedPoliciesPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -715,46 +715,46 @@ func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextRe
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
 	result.page, err = client.ListAvailableSslPredefinedPolicies(ctx)
 	return
 }
 
 // ListAvailableWafRuleSets lists all available web application firewall rule sets.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	req, err := client.ListAvailableWafRuleSetsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableWafRuleSetsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableWafRuleSetsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableWafRuleSetsPreparer prepares the ListAvailableWafRuleSets request.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -774,14 +774,14 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx con
 
 // ListAvailableWafRuleSetsSender sends the ListAvailableWafRuleSets request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableWafRuleSetsResponder handles the response to the ListAvailableWafRuleSets request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -796,16 +796,16 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStartFuture, err error) {
 	req, err := client.StartPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StartSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -813,7 +813,7 @@ func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroup
 }
 
 // StartPreparer prepares the Start request.
-func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -835,7 +835,7 @@ func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resou
 
 // StartSender sends the Start request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StartSender(req *http.Request) (future ApplicationGatewaysGroupStartFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -850,7 +850,7 @@ func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future A
 
 // StartResponder handles the response to the Start request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -864,16 +864,16 @@ func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -881,7 +881,7 @@ func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupN
 }
 
 // StopPreparer prepares the Stop request.
-func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -903,7 +903,7 @@ func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resour
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StopSender(req *http.Request) (future ApplicationGatewaysGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -918,7 +918,7 @@ func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future Ap
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-08-01/network/availableendpointservices.go b/services/network/mgmt/2017-08-01/network/availableendpointservicesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-08-01/network/availableendpointservices.go
rename to services/network/mgmt/2017-08-01/network/availableendpointservicesgroup.go
index 01702f7dae48..56fb5cd2a0d4 100644
--- a/services/network/mgmt/2017-08-01/network/availableendpointservices.go
+++ b/services/network/mgmt/2017-08-01/network/availableendpointservicesgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// AvailableEndpointServicesClient is the network Client
-type AvailableEndpointServicesClient struct {
+// AvailableEndpointServicesGroupClient is the network Client
+type AvailableEndpointServicesGroupClient struct {
 	BaseClient
 }
 
-// NewAvailableEndpointServicesClient creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClient(subscriptionID string) AvailableEndpointServicesClient {
-	return NewAvailableEndpointServicesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewAvailableEndpointServicesGroupClient creates an instance of the AvailableEndpointServicesGroupClient client.
+func NewAvailableEndpointServicesGroupClient(subscriptionID string) AvailableEndpointServicesGroupClient {
+	return NewAvailableEndpointServicesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewAvailableEndpointServicesClientWithBaseURI creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesClient {
-	return AvailableEndpointServicesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewAvailableEndpointServicesGroupClientWithBaseURI creates an instance of the AvailableEndpointServicesGroupClient
+// client.
+func NewAvailableEndpointServicesGroupClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesGroupClient {
+	return AvailableEndpointServicesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list what values of endpoint services are available for use.
 //
 // location is the location to check available endpoint services.
-func (client AvailableEndpointServicesClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
+func (client AvailableEndpointServicesGroupClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.eslr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.eslr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client AvailableEndpointServicesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -87,14 +88,14 @@ func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client AvailableEndpointServicesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client AvailableEndpointServicesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -106,10 +107,10 @@ func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client AvailableEndpointServicesClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
 	req, err := lastResults.endpointServicesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -117,17 +118,17 @@ func (client AvailableEndpointServicesClient) listNextResults(lastResults Endpoi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client AvailableEndpointServicesClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
+func (client AvailableEndpointServicesGroupClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/bgpservicecommunities.go b/services/network/mgmt/2017-08-01/network/bgpservicecommunitiesgroup.go
similarity index 63%
rename from services/network/mgmt/2017-08-01/network/bgpservicecommunities.go
rename to services/network/mgmt/2017-08-01/network/bgpservicecommunitiesgroup.go
index 2ad6ba61214e..ea6242b24634 100644
--- a/services/network/mgmt/2017-08-01/network/bgpservicecommunities.go
+++ b/services/network/mgmt/2017-08-01/network/bgpservicecommunitiesgroup.go
@@ -24,47 +24,47 @@ import (
 	"net/http"
 )
 
-// BgpServiceCommunitiesClient is the network Client
-type BgpServiceCommunitiesClient struct {
+// BgpServiceCommunitiesGroupClient is the network Client
+type BgpServiceCommunitiesGroupClient struct {
 	BaseClient
 }
 
-// NewBgpServiceCommunitiesClient creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
-	return NewBgpServiceCommunitiesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewBgpServiceCommunitiesGroupClient creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClient(subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return NewBgpServiceCommunitiesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewBgpServiceCommunitiesClientWithBaseURI creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
-	return BgpServiceCommunitiesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewBgpServiceCommunitiesGroupClientWithBaseURI creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return BgpServiceCommunitiesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available bgp service communities.
-func (client BgpServiceCommunitiesClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
+func (client BgpServiceCommunitiesGroupClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.bsclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.bsclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client BgpServiceCommunitiesGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -84,14 +84,14 @@ func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*ht
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client BgpServiceCommunitiesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client BgpServiceCommunitiesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -103,10 +103,10 @@ func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
 	req, err := lastResults.bgpServiceCommunityListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -114,17 +114,17 @@ func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpService
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client BgpServiceCommunitiesClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/client.go b/services/network/mgmt/2017-08-01/network/client.go
index fa4a43b271a2..c94ce1ee38a6 100644
--- a/services/network/mgmt/2017-08-01/network/client.go
+++ b/services/network/mgmt/2017-08-01/network/client.go
@@ -21,10 +21,7 @@ package network
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 
 import (
-	"context"
 	"github.com/Azure/go-autorest/autorest"
-	"github.com/Azure/go-autorest/autorest/azure"
-	"net/http"
 )
 
 const (
@@ -52,70 +49,3 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
 		SubscriptionID: subscriptionID,
 	}
 }
-
-// CheckDNSNameAvailability checks whether a domain name in the cloudapp.azure.com zone is available for use.
-//
-// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
-// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
-func (client BaseClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
-	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
-		return
-	}
-
-	resp, err := client.CheckDNSNameAvailabilitySender(req)
-	if err != nil {
-		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure sending request")
-		return
-	}
-
-	result, err = client.CheckDNSNameAvailabilityResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
-	}
-
-	return
-}
-
-// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
-func (client BaseClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
-	pathParameters := map[string]interface{}{
-		"location":       autorest.Encode("path", location),
-		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
-	}
-
-	const APIVersion = "2017-08-01"
-	queryParameters := map[string]interface{}{
-		"api-version":     APIVersion,
-		"domainNameLabel": autorest.Encode("query", domainNameLabel),
-	}
-
-	preparer := autorest.CreatePreparer(
-		autorest.AsGet(),
-		autorest.WithBaseURL(client.BaseURI),
-		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
-		autorest.WithQueryParameters(queryParameters))
-	return preparer.Prepare((&http.Request{}).WithContext(ctx))
-}
-
-// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
-// http.Response Body if it receives an error.
-func (client BaseClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
-	return autorest.SendWithSender(client, req,
-		azure.DoRetryWithRegistration(client.Client))
-}
-
-// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
-// closes the http.Response Body.
-func (client BaseClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
-	err = autorest.Respond(
-		resp,
-		client.ByInspecting(),
-		azure.WithErrorUnlessStatusCode(http.StatusOK),
-		autorest.ByUnmarshallingJSON(&result),
-		autorest.ByClosing())
-	result.Response = autorest.Response{Response: resp}
-	return
-}
diff --git a/services/network/mgmt/2017-08-01/network/defaultsecurityrules.go b/services/network/mgmt/2017-08-01/network/defaultsecurityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-08-01/network/defaultsecurityrules.go
rename to services/network/mgmt/2017-08-01/network/defaultsecurityrulesgroup.go
index 4e8d9153101a..51f5a4768d3c 100644
--- a/services/network/mgmt/2017-08-01/network/defaultsecurityrules.go
+++ b/services/network/mgmt/2017-08-01/network/defaultsecurityrulesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// DefaultSecurityRulesClient is the network Client
-type DefaultSecurityRulesClient struct {
+// DefaultSecurityRulesGroupClient is the network Client
+type DefaultSecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewDefaultSecurityRulesClient creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClient(subscriptionID string) DefaultSecurityRulesClient {
-	return NewDefaultSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewDefaultSecurityRulesGroupClient creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClient(subscriptionID string) DefaultSecurityRulesGroupClient {
+	return NewDefaultSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewDefaultSecurityRulesClientWithBaseURI creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesClient {
-	return DefaultSecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewDefaultSecurityRulesGroupClientWithBaseURI creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesGroupClient {
+	return DefaultSecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get get the specified default network security rule.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. defaultSecurityRuleName is the name of the default security rule.
-func (client DefaultSecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"defaultSecurityRuleName":  autorest.Encode("path", defaultSecurityRuleName),
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
@@ -89,14 +89,14 @@ func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +111,31 @@ func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client DefaultSecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client DefaultSecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -157,14 +157,14 @@ func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +176,10 @@ func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +187,17 @@ func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client DefaultSecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client DefaultSecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/expressroutecircuitauthorizations.go b/services/network/mgmt/2017-08-01/network/expressroutecircuitauthorizationsgroup.go
similarity index 67%
rename from services/network/mgmt/2017-08-01/network/expressroutecircuitauthorizations.go
rename to services/network/mgmt/2017-08-01/network/expressroutecircuitauthorizationsgroup.go
index 96febf307d97..eed57e3e3ffa 100644
--- a/services/network/mgmt/2017-08-01/network/expressroutecircuitauthorizations.go
+++ b/services/network/mgmt/2017-08-01/network/expressroutecircuitauthorizationsgroup.go
@@ -24,21 +24,21 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitAuthorizationsClient is the network Client
-type ExpressRouteCircuitAuthorizationsClient struct {
+// ExpressRouteCircuitAuthorizationsGroupClient is the network Client
+type ExpressRouteCircuitAuthorizationsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitAuthorizationsClient creates an instance of the ExpressRouteCircuitAuthorizationsClient
-// client.
-func NewExpressRouteCircuitAuthorizationsClient(subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return NewExpressRouteCircuitAuthorizationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitAuthorizationsGroupClient creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClient(subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitAuthorizationsClientWithBaseURI creates an instance of the
-// ExpressRouteCircuitAuthorizationsClient client.
-func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return ExpressRouteCircuitAuthorizationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return ExpressRouteCircuitAuthorizationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an authorization in the specified express route circuit.
@@ -46,16 +46,16 @@ func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subsc
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization. authorizationParameters is parameters supplied to the create
 // or update express route circuit authorization operation.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, authorizationName, authorizationParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -63,7 +63,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -88,7 +88,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -103,7 +103,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -118,16 +118,16 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(re
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -135,7 +135,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -158,7 +158,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -173,7 +173,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Req
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -187,30 +187,30 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -233,14 +233,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Co
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -254,31 +254,31 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Re
 // List gets all authorizations in an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit.
-func (client ExpressRouteCircuitAuthorizationsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.alr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.alr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -300,14 +300,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.C
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -319,10 +319,10 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.R
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
 	req, err := lastResults.authorizationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -330,17 +330,17 @@ func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitAuthorizationsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/expressroutecircuitpeerings.go b/services/network/mgmt/2017-08-01/network/expressroutecircuitpeeringsgroup.go
similarity index 68%
rename from services/network/mgmt/2017-08-01/network/expressroutecircuitpeerings.go
rename to services/network/mgmt/2017-08-01/network/expressroutecircuitpeeringsgroup.go
index 2572e9bee72e..3f650f06743e 100644
--- a/services/network/mgmt/2017-08-01/network/expressroutecircuitpeerings.go
+++ b/services/network/mgmt/2017-08-01/network/expressroutecircuitpeeringsgroup.go
@@ -24,19 +24,20 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitPeeringsClient is the network Client
-type ExpressRouteCircuitPeeringsClient struct {
+// ExpressRouteCircuitPeeringsGroupClient is the network Client
+type ExpressRouteCircuitPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitPeeringsClient creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return NewExpressRouteCircuitPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitPeeringsGroupClient creates an instance of the ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClient(subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitPeeringsClientWithBaseURI creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return ExpressRouteCircuitPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitPeeringsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return ExpressRouteCircuitPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified express route circuits.
@@ -44,16 +45,16 @@ func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptio
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. peeringParameters is parameters supplied to the create or update express
 // route circuit peering operation.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, peeringName, peeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +62,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Conte
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -86,7 +87,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +102,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.R
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +117,16 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +134,7 @@ func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, reso
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -156,7 +157,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Conte
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +172,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request)
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +186,30 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -231,14 +232,14 @@ func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context,
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +253,31 @@ func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response
 // List gets all peerings in a specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitPeeringsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ercplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ercplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -298,14 +299,14 @@ func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +318,10 @@ func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Respons
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
 	req, err := lastResults.expressRouteCircuitPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +329,17 @@ func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults Expr
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/expressroutecircuits.go b/services/network/mgmt/2017-08-01/network/expressroutecircuitsgroup.go
similarity index 71%
rename from services/network/mgmt/2017-08-01/network/expressroutecircuits.go
rename to services/network/mgmt/2017-08-01/network/expressroutecircuitsgroup.go
index fc12681f4e54..013a494b220f 100644
--- a/services/network/mgmt/2017-08-01/network/expressroutecircuits.go
+++ b/services/network/mgmt/2017-08-01/network/expressroutecircuitsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitsClient is the network Client
-type ExpressRouteCircuitsClient struct {
+// ExpressRouteCircuitsGroupClient is the network Client
+type ExpressRouteCircuitsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitsClient creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
-	return NewExpressRouteCircuitsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitsGroupClient creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClient(subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return NewExpressRouteCircuitsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitsClientWithBaseURI creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
-	return ExpressRouteCircuitsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitsGroupClientWithBaseURI creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return ExpressRouteCircuitsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is
 // parameters supplied to the create or update express route circuit operation.
-func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Resp
 // Delete deletes the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -180,30 +180,30 @@ func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (r
 // Get gets information about the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of express route circuit.
-func (client ExpressRouteCircuitsClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -225,14 +225,14 @@ func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -247,30 +247,30 @@ func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitsClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetPeeringStatsPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetPeeringStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetPeeringStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPeeringStatsPreparer prepares the GetPeeringStats request.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -293,14 +293,14 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Con
 
 // GetPeeringStatsSender sends the GetPeeringStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetPeeringStatsResponder handles the response to the GetPeeringStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,30 +314,30 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Res
 // GetStats gets all the stats from an express route circuit in a resource group.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetStatsPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetStatsPreparer prepares the GetStats request.
-func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -359,14 +359,14 @@ func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, r
 
 // GetStatsSender sends the GetStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetStatsResponder handles the response to the GetStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -380,31 +380,31 @@ func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response)
 // List gets all the express route circuits in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ExpressRouteCircuitsClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -425,14 +425,14 @@ func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -444,10 +444,10 @@ func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -455,47 +455,47 @@ func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRout
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the express route circuits in a subscription.
-func (client ExpressRouteCircuitsClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -515,14 +515,14 @@ func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -534,10 +534,10 @@ func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -545,17 +545,17 @@ func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressR
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -564,16 +564,16 @@ func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (r
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	req, err := client.ListArpTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListArpTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -581,7 +581,7 @@ func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resou
 }
 
 // ListArpTablePreparer prepares the ListArpTable request.
-func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -605,7 +605,7 @@ func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Contex
 
 // ListArpTableSender sends the ListArpTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -620,7 +620,7 @@ func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (
 
 // ListArpTableResponder handles the response to the ListArpTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -636,16 +636,16 @@ func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	req, err := client.ListRoutesTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -653,7 +653,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, re
 }
 
 // ListRoutesTablePreparer prepares the ListRoutesTable request.
-func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -677,7 +677,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Con
 
 // ListRoutesTableSender sends the ListRoutesTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -692,7 +692,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request
 
 // ListRoutesTableResponder handles the response to the ListRoutesTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -708,16 +708,16 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	req, err := client.ListRoutesTableSummaryPreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSummarySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -725,7 +725,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Cont
 }
 
 // ListRoutesTableSummaryPreparer prepares the ListRoutesTableSummary request.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -749,7 +749,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx cont
 
 // ListRoutesTableSummarySender sends the ListRoutesTableSummary request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -764,7 +764,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.
 
 // ListRoutesTableSummaryResponder handles the response to the ListRoutesTableSummary request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-08-01/network/expressrouteserviceproviders.go b/services/network/mgmt/2017-08-01/network/expressrouteserviceprovidersgroup.go
similarity index 61%
rename from services/network/mgmt/2017-08-01/network/expressrouteserviceproviders.go
rename to services/network/mgmt/2017-08-01/network/expressrouteserviceprovidersgroup.go
index 18c6f367923b..f337f72fd467 100644
--- a/services/network/mgmt/2017-08-01/network/expressrouteserviceproviders.go
+++ b/services/network/mgmt/2017-08-01/network/expressrouteserviceprovidersgroup.go
@@ -24,48 +24,49 @@ import (
 	"net/http"
 )
 
-// ExpressRouteServiceProvidersClient is the network Client
-type ExpressRouteServiceProvidersClient struct {
+// ExpressRouteServiceProvidersGroupClient is the network Client
+type ExpressRouteServiceProvidersGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteServiceProvidersClient creates an instance of the ExpressRouteServiceProvidersClient client.
-func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
-	return NewExpressRouteServiceProvidersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteServiceProvidersGroupClient creates an instance of the ExpressRouteServiceProvidersGroupClient
+// client.
+func NewExpressRouteServiceProvidersGroupClient(subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return NewExpressRouteServiceProvidersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteServiceProvidersClientWithBaseURI creates an instance of the ExpressRouteServiceProvidersClient
-// client.
-func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
-	return ExpressRouteServiceProvidersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteServiceProvidersGroupClientWithBaseURI creates an instance of the
+// ExpressRouteServiceProvidersGroupClient client.
+func NewExpressRouteServiceProvidersGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return ExpressRouteServiceProvidersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available express route service providers.
-func (client ExpressRouteServiceProvidersClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ersplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ersplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -85,14 +86,14 @@ func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteServiceProvidersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -104,10 +105,10 @@ func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Respon
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
 	req, err := lastResults.expressRouteServiceProviderListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -115,17 +116,17 @@ func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults Exp
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteServiceProvidersClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/group.go b/services/network/mgmt/2017-08-01/network/group.go
new file mode 100644
index 000000000000..8d17c093e172
--- /dev/null
+++ b/services/network/mgmt/2017-08-01/network/group.go
@@ -0,0 +1,107 @@
+package network
+
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"context"
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"net/http"
+)
+
+// GroupClient is the network Client
+type GroupClient struct {
+	BaseClient
+}
+
+// NewGroupClient creates an instance of the GroupClient client.
+func NewGroupClient(subscriptionID string) GroupClient {
+	return NewGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
+}
+
+// NewGroupClientWithBaseURI creates an instance of the GroupClient client.
+func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
+	return GroupClient{NewWithBaseURI(baseURI, subscriptionID)}
+}
+
+// CheckDNSNameAvailability checks whether a domain name in the cloudapp.azure.com zone is available for use.
+//
+// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
+// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+func (client GroupClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
+	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := client.CheckDNSNameAvailabilitySender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure sending request")
+		return
+	}
+
+	result, err = client.CheckDNSNameAvailabilityResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
+	}
+
+	return
+}
+
+// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
+func (client GroupClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
+	pathParameters := map[string]interface{}{
+		"location":       autorest.Encode("path", location),
+		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
+	}
+
+	const APIVersion = "2017-08-01"
+	queryParameters := map[string]interface{}{
+		"api-version":     APIVersion,
+		"domainNameLabel": autorest.Encode("query", domainNameLabel),
+	}
+
+	preparer := autorest.CreatePreparer(
+		autorest.AsGet(),
+		autorest.WithBaseURL(client.BaseURI),
+		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
+		autorest.WithQueryParameters(queryParameters))
+	return preparer.Prepare((&http.Request{}).WithContext(ctx))
+}
+
+// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
+// http.Response Body if it receives an error.
+func (client GroupClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
+	return autorest.SendWithSender(client, req,
+		azure.DoRetryWithRegistration(client.Client))
+}
+
+// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
+// closes the http.Response Body.
+func (client GroupClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
+	err = autorest.Respond(
+		resp,
+		client.ByInspecting(),
+		azure.WithErrorUnlessStatusCode(http.StatusOK),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}
diff --git a/services/network/mgmt/2017-08-01/network/inboundnatrules.go b/services/network/mgmt/2017-08-01/network/inboundnatrulesgroup.go
similarity index 74%
rename from services/network/mgmt/2017-08-01/network/inboundnatrules.go
rename to services/network/mgmt/2017-08-01/network/inboundnatrulesgroup.go
index acb4ebf7b227..d639ea6b2b7c 100644
--- a/services/network/mgmt/2017-08-01/network/inboundnatrules.go
+++ b/services/network/mgmt/2017-08-01/network/inboundnatrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// InboundNatRulesClient is the network Client
-type InboundNatRulesClient struct {
+// InboundNatRulesGroupClient is the network Client
+type InboundNatRulesGroupClient struct {
 	BaseClient
 }
 
-// NewInboundNatRulesClient creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClient(subscriptionID string) InboundNatRulesClient {
-	return NewInboundNatRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInboundNatRulesGroupClient creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClient(subscriptionID string) InboundNatRulesGroupClient {
+	return NewInboundNatRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInboundNatRulesClientWithBaseURI creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesClient {
-	return InboundNatRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInboundNatRulesGroupClientWithBaseURI creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesGroupClient {
+	return InboundNatRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer inbound nat rule.
@@ -45,7 +45,7 @@ func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. inboundNatRuleParameters is parameters supplied to the
 // create or update inbound nat rule operation.
-func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: inboundNatRuleParameters,
 			Constraints: []validation.Constraint{{Target: "inboundNatRuleParameters.InboundNatRulePropertiesFormat", Name: validation.Null, Rule: false,
@@ -62,18 +62,18 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 						}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.InboundNatRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.InboundNatRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -81,7 +81,7 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -106,7 +106,7 @@ func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -121,7 +121,7 @@ func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -136,16 +136,16 @@ func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule.
-func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -153,7 +153,7 @@ func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -176,7 +176,7 @@ func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) DeleteSender(req *http.Request) (future InboundNatRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -191,7 +191,7 @@ func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future Inbo
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InboundNatRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -205,30 +205,30 @@ func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. expand is expands referenced resources.
-func (client InboundNatRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -254,14 +254,14 @@ func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -275,31 +275,31 @@ func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result In
 // List gets all the inbound nat rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client InboundNatRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
+func (client InboundNatRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.inrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.inrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -321,14 +321,14 @@ func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -340,10 +340,10 @@ func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result I
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
 	req, err := lastResults.inboundNatRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -351,17 +351,17 @@ func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InboundNatRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
+func (client InboundNatRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/interfaceipconfigurations.go b/services/network/mgmt/2017-08-01/network/interfaceipconfigurationsgroup.go
similarity index 66%
rename from services/network/mgmt/2017-08-01/network/interfaceipconfigurations.go
rename to services/network/mgmt/2017-08-01/network/interfaceipconfigurationsgroup.go
index 9409c86c87ee..f6e756c9459c 100644
--- a/services/network/mgmt/2017-08-01/network/interfaceipconfigurations.go
+++ b/services/network/mgmt/2017-08-01/network/interfaceipconfigurationsgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// InterfaceIPConfigurationsClient is the network Client
-type InterfaceIPConfigurationsClient struct {
+// InterfaceIPConfigurationsGroupClient is the network Client
+type InterfaceIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceIPConfigurationsClient creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClient(subscriptionID string) InterfaceIPConfigurationsClient {
-	return NewInterfaceIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceIPConfigurationsGroupClient creates an instance of the InterfaceIPConfigurationsGroupClient client.
+func NewInterfaceIPConfigurationsGroupClient(subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return NewInterfaceIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceIPConfigurationsClientWithBaseURI creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsClient {
-	return InterfaceIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceIPConfigurationsGroupClientWithBaseURI creates an instance of the InterfaceIPConfigurationsGroupClient
+// client.
+func NewInterfaceIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return InterfaceIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified network interface ip configuration.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // IPConfigurationName is the name of the ip configuration name.
-func (client InterfaceIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":  autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
@@ -89,14 +90,14 @@ func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, r
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +111,31 @@ func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response)
 // List get all ip configurations in a network interface
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
+func (client InterfaceIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.iiclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.iiclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -156,14 +157,14 @@ func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +176,10 @@ func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceIPConfigurationsClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
 	req, err := lastResults.interfaceIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +187,17 @@ func (client InterfaceIPConfigurationsClient) listNextResults(lastResults Interf
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/interfaceloadbalancers.go b/services/network/mgmt/2017-08-01/network/interfaceloadbalancersgroup.go
similarity index 63%
rename from services/network/mgmt/2017-08-01/network/interfaceloadbalancers.go
rename to services/network/mgmt/2017-08-01/network/interfaceloadbalancersgroup.go
index af4b8cf22f33..44c43b96034c 100644
--- a/services/network/mgmt/2017-08-01/network/interfaceloadbalancers.go
+++ b/services/network/mgmt/2017-08-01/network/interfaceloadbalancersgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// InterfaceLoadBalancersClient is the network Client
-type InterfaceLoadBalancersClient struct {
+// InterfaceLoadBalancersGroupClient is the network Client
+type InterfaceLoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceLoadBalancersClient creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClient(subscriptionID string) InterfaceLoadBalancersClient {
-	return NewInterfaceLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceLoadBalancersGroupClient creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClient(subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return NewInterfaceLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceLoadBalancersClientWithBaseURI creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersClient {
-	return InterfaceLoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceLoadBalancersGroupClientWithBaseURI creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return InterfaceLoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list all load balancers in a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceLoadBalancersClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
+func (client InterfaceLoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceLoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -88,14 +88,14 @@ func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceLoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceLoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -107,10 +107,10 @@ func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceLoadBalancersClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
 	req, err := lastResults.interfaceLoadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -118,17 +118,17 @@ func (client InterfaceLoadBalancersClient) listNextResults(lastResults Interface
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceLoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/interfaces.go b/services/network/mgmt/2017-08-01/network/interfacesgroup.go
similarity index 66%
rename from services/network/mgmt/2017-08-01/network/interfaces.go
rename to services/network/mgmt/2017-08-01/network/interfacesgroup.go
index f3cb6971ac97..7201a46f9253 100644
--- a/services/network/mgmt/2017-08-01/network/interfaces.go
+++ b/services/network/mgmt/2017-08-01/network/interfacesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// InterfacesClient is the network Client
-type InterfacesClient struct {
+// InterfacesGroupClient is the network Client
+type InterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewInterfacesClient creates an instance of the InterfacesClient client.
-func NewInterfacesClient(subscriptionID string) InterfacesClient {
-	return NewInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfacesGroupClient creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClient(subscriptionID string) InterfacesGroupClient {
+	return NewInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfacesClientWithBaseURI creates an instance of the InterfacesClient client.
-func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
-	return InterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfacesGroupClientWithBaseURI creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfacesGroupClient {
+	return InterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // parameters is parameters supplied to the create or update network interface operation.
-func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkInterfaceName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroup
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
+func (client InterfacesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resou
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateSender(req *http.Request) (future InterfacesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future I
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (res
 // Delete deletes the specified network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName str
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroup
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) DeleteSender(req *http.Request) (future InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) DeleteSender(req *http.Request) (future InterfacesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client InterfacesClient) DeleteSender(req *http.Request) (future Interface
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InterfacesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client InterfacesClient) DeleteResponder(resp *http.Response) (result auto
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // expand is expands referenced resources.
-func (client InterfacesClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupNam
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,16 +250,16 @@ func (client InterfacesClient) GetResponder(resp *http.Response) (result Interfa
 // GetEffectiveRouteTable gets all route tables applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	req, err := client.GetEffectiveRouteTablePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetEffectiveRouteTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -267,7 +267,7 @@ func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resou
 }
 
 // GetEffectiveRouteTablePreparer prepares the GetEffectiveRouteTable request.
-func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -289,7 +289,7 @@ func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Contex
 
 // GetEffectiveRouteTableSender sends the GetEffectiveRouteTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -304,7 +304,7 @@ func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (
 
 // GetEffectiveRouteTableResponder handles the response to the GetEffectiveRouteTable request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,30 +320,30 @@ func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Respon
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. expand is expands referenced resources.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetNetworkInterfaceSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetNetworkInterfaceResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetNetworkInterfacePreparer prepares the GetVirtualMachineScaleSetNetworkInterface request.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
@@ -370,14 +370,14 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer
 
 // GetVirtualMachineScaleSetNetworkInterfaceSender sends the GetVirtualMachineScaleSetNetworkInterface request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetNetworkInterfaceResponder handles the response to the GetVirtualMachineScaleSetNetworkInterface request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -391,31 +391,31 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponde
 // List gets all network interfaces in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client InterfacesClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -436,14 +436,14 @@ func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupNa
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -455,10 +455,10 @@ func (client InterfacesClient) ListResponder(resp *http.Response) (result Interf
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -466,47 +466,47 @@ func (client InterfacesClient) listNextResults(lastResults InterfaceListResult)
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network interfaces in a subscription.
-func (client InterfacesClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client InterfacesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -526,14 +526,14 @@ func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Reque
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -545,10 +545,10 @@ func (client InterfacesClient) ListAllResponder(resp *http.Response) (result Int
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -556,17 +556,17 @@ func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResul
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -574,16 +574,16 @@ func (client InterfacesClient) ListAllComplete(ctx context.Context) (result Inte
 // ListEffectiveNetworkSecurityGroups gets all network security groups applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	req, err := client.ListEffectiveNetworkSecurityGroupsPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListEffectiveNetworkSecurityGroupsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -591,7 +591,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Co
 }
 
 // ListEffectiveNetworkSecurityGroupsPreparer prepares the ListEffectiveNetworkSecurityGroups request.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -613,7 +613,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx co
 
 // ListEffectiveNetworkSecurityGroupsSender sends the ListEffectiveNetworkSecurityGroups request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -628,7 +628,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *htt
 
 // ListEffectiveNetworkSecurityGroupsResponder handles the response to the ListEffectiveNetworkSecurityGroups request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -643,31 +643,31 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -689,14 +689,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPrepar
 
 // ListVirtualMachineScaleSetNetworkInterfacesSender sends the ListVirtualMachineScaleSetNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -708,10 +708,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesRespon
 }
 
 // listVirtualMachineScaleSetNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -719,17 +719,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextRe
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -739,31 +739,31 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComple
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetVMNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -786,14 +786,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPrep
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesSender sends the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -805,10 +805,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResp
 }
 
 // listVirtualMachineScaleSetVMNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -816,17 +816,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNext
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/loadbalancerbackendaddresspools.go b/services/network/mgmt/2017-08-01/network/loadbalancerbackendaddresspoolsgroup.go
similarity index 64%
rename from services/network/mgmt/2017-08-01/network/loadbalancerbackendaddresspools.go
rename to services/network/mgmt/2017-08-01/network/loadbalancerbackendaddresspoolsgroup.go
index 3bbddd7376c5..0d3cfab22513 100644
--- a/services/network/mgmt/2017-08-01/network/loadbalancerbackendaddresspools.go
+++ b/services/network/mgmt/2017-08-01/network/loadbalancerbackendaddresspoolsgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerBackendAddressPoolsClient is the network Client
-type LoadBalancerBackendAddressPoolsClient struct {
+// LoadBalancerBackendAddressPoolsGroupClient is the network Client
+type LoadBalancerBackendAddressPoolsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerBackendAddressPoolsClient creates an instance of the LoadBalancerBackendAddressPoolsClient client.
-func NewLoadBalancerBackendAddressPoolsClient(subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return NewLoadBalancerBackendAddressPoolsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerBackendAddressPoolsGroupClient creates an instance of the LoadBalancerBackendAddressPoolsGroupClient
+// client.
+func NewLoadBalancerBackendAddressPoolsGroupClient(subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerBackendAddressPoolsClientWithBaseURI creates an instance of the LoadBalancerBackendAddressPoolsClient
-// client.
-func NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return LoadBalancerBackendAddressPoolsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerBackendAddressPoolsGroupClient client.
+func NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return LoadBalancerBackendAddressPoolsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer backend address pool.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // backendAddressPoolName is the name of the backend address pool.
-func (client LoadBalancerBackendAddressPoolsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, backendAddressPoolName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"backendAddressPoolName": autorest.Encode("path", backendAddressPoolName),
 		"loadBalancerName":       autorest.Encode("path", loadBalancerName),
@@ -90,14 +91,14 @@ func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Cont
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Resp
 // List gets all the load balancer backed address pools.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerBackendAddressPoolsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbbaplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbbaplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Con
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	req, err := lastResults.loadBalancerBackendAddressPoolListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerBackendAddressPoolsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/loadbalancerfrontendipconfigurations.go b/services/network/mgmt/2017-08-01/network/loadbalancerfrontendipconfigurationsgroup.go
similarity index 63%
rename from services/network/mgmt/2017-08-01/network/loadbalancerfrontendipconfigurations.go
rename to services/network/mgmt/2017-08-01/network/loadbalancerfrontendipconfigurationsgroup.go
index a4a531d12bd3..ae1d755addce 100644
--- a/services/network/mgmt/2017-08-01/network/loadbalancerfrontendipconfigurations.go
+++ b/services/network/mgmt/2017-08-01/network/loadbalancerfrontendipconfigurationsgroup.go
@@ -24,51 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerFrontendIPConfigurationsClient is the network Client
-type LoadBalancerFrontendIPConfigurationsClient struct {
+// LoadBalancerFrontendIPConfigurationsGroupClient is the network Client
+type LoadBalancerFrontendIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClient creates an instance of the LoadBalancerFrontendIPConfigurationsClient
-// client.
-func NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerFrontendIPConfigurationsGroupClient creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI creates an instance of the
-// LoadBalancerFrontendIPConfigurationsClient client.
-func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return LoadBalancerFrontendIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return LoadBalancerFrontendIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer frontend IP configuration.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // frontendIPConfigurationName is the name of the frontend IP configuration.
-func (client LoadBalancerFrontendIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, frontendIPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"frontendIPConfigurationName": autorest.Encode("path", frontendIPConfigurationName),
 		"loadBalancerName":            autorest.Encode("path", loadBalancerName),
@@ -91,14 +91,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -112,31 +112,31 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http
 // List gets all the load balancer frontend IP configurations.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerFrontendIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbficlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbficlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -158,14 +158,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -177,10 +177,10 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *htt
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	req, err := lastResults.loadBalancerFrontendIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -188,17 +188,17 @@ func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastRes
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/loadbalancerloadbalancingrules.go b/services/network/mgmt/2017-08-01/network/loadbalancerloadbalancingrulesgroup.go
similarity index 65%
rename from services/network/mgmt/2017-08-01/network/loadbalancerloadbalancingrules.go
rename to services/network/mgmt/2017-08-01/network/loadbalancerloadbalancingrulesgroup.go
index 6e7023193f7a..5e2a4ce621c0 100644
--- a/services/network/mgmt/2017-08-01/network/loadbalancerloadbalancingrules.go
+++ b/services/network/mgmt/2017-08-01/network/loadbalancerloadbalancingrulesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerLoadBalancingRulesClient is the network Client
-type LoadBalancerLoadBalancingRulesClient struct {
+// LoadBalancerLoadBalancingRulesGroupClient is the network Client
+type LoadBalancerLoadBalancingRulesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerLoadBalancingRulesClient creates an instance of the LoadBalancerLoadBalancingRulesClient client.
-func NewLoadBalancerLoadBalancingRulesClient(subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return NewLoadBalancerLoadBalancingRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerLoadBalancingRulesGroupClient creates an instance of the LoadBalancerLoadBalancingRulesGroupClient
+// client.
+func NewLoadBalancerLoadBalancingRulesGroupClient(subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerLoadBalancingRulesClientWithBaseURI creates an instance of the LoadBalancerLoadBalancingRulesClient
-// client.
-func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return LoadBalancerLoadBalancingRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerLoadBalancingRulesGroupClient client.
+func NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return LoadBalancerLoadBalancingRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified load balancer load balancing rule.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // loadBalancingRuleName is the name of the load balancing rule.
-func (client LoadBalancerLoadBalancingRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, loadBalancingRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":      autorest.Encode("path", loadBalancerName),
 		"loadBalancingRuleName": autorest.Encode("path", loadBalancingRuleName),
@@ -90,14 +91,14 @@ func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Conte
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Respo
 // List gets all the load balancing rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerLoadBalancingRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblbrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblbrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Cont
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Resp
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	req, err := lastResults.loadBalancerLoadBalancingRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults L
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerLoadBalancingRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/loadbalancernetworkinterfaces.go b/services/network/mgmt/2017-08-01/network/loadbalancernetworkinterfacesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-08-01/network/loadbalancernetworkinterfaces.go
rename to services/network/mgmt/2017-08-01/network/loadbalancernetworkinterfacesgroup.go
index 7c28f9942201..2eebb895ea86 100644
--- a/services/network/mgmt/2017-08-01/network/loadbalancernetworkinterfaces.go
+++ b/services/network/mgmt/2017-08-01/network/loadbalancernetworkinterfacesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerNetworkInterfacesClient is the network Client
-type LoadBalancerNetworkInterfacesClient struct {
+// LoadBalancerNetworkInterfacesGroupClient is the network Client
+type LoadBalancerNetworkInterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerNetworkInterfacesClient creates an instance of the LoadBalancerNetworkInterfacesClient client.
-func NewLoadBalancerNetworkInterfacesClient(subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return NewLoadBalancerNetworkInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerNetworkInterfacesGroupClient creates an instance of the LoadBalancerNetworkInterfacesGroupClient
+// client.
+func NewLoadBalancerNetworkInterfacesGroupClient(subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerNetworkInterfacesClientWithBaseURI creates an instance of the LoadBalancerNetworkInterfacesClient
-// client.
-func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return LoadBalancerNetworkInterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerNetworkInterfacesGroupClient client.
+func NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return LoadBalancerNetworkInterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets associated load balancer network interfaces.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerNetworkInterfacesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -89,14 +90,14 @@ func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Conte
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerNetworkInterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -108,10 +109,10 @@ func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Respo
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -119,17 +120,17 @@ func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults In
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerNetworkInterfacesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/loadbalancerprobes.go b/services/network/mgmt/2017-08-01/network/loadbalancerprobesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-08-01/network/loadbalancerprobes.go
rename to services/network/mgmt/2017-08-01/network/loadbalancerprobesgroup.go
index 12aaa578c8cf..1d3354c5fea8 100644
--- a/services/network/mgmt/2017-08-01/network/loadbalancerprobes.go
+++ b/services/network/mgmt/2017-08-01/network/loadbalancerprobesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// LoadBalancerProbesClient is the network Client
-type LoadBalancerProbesClient struct {
+// LoadBalancerProbesGroupClient is the network Client
+type LoadBalancerProbesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerProbesClient creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClient(subscriptionID string) LoadBalancerProbesClient {
-	return NewLoadBalancerProbesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerProbesGroupClient creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClient(subscriptionID string) LoadBalancerProbesGroupClient {
+	return NewLoadBalancerProbesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerProbesClientWithBaseURI creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesClient {
-	return LoadBalancerProbesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerProbesGroupClientWithBaseURI creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesGroupClient {
+	return LoadBalancerProbesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer probe.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // probeName is the name of the probe.
-func (client LoadBalancerProbesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, probeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"probeName":         autorest.Encode("path", probeName),
@@ -89,14 +89,14 @@ func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resource
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) GetResponder(resp *http.Response) (result Probe, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +110,31 @@ func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result
 // List gets all the load balancer probes.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerProbesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
+func (client LoadBalancerProbesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -156,14 +156,14 @@ func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourc
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +175,10 @@ func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (resul
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
 	req, err := lastResults.loadBalancerProbeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +186,17 @@ func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerP
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerProbesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
+func (client LoadBalancerProbesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/loadbalancers.go b/services/network/mgmt/2017-08-01/network/loadbalancersgroup.go
similarity index 65%
rename from services/network/mgmt/2017-08-01/network/loadbalancers.go
rename to services/network/mgmt/2017-08-01/network/loadbalancersgroup.go
index 3014b221dc72..6150c36601d1 100644
--- a/services/network/mgmt/2017-08-01/network/loadbalancers.go
+++ b/services/network/mgmt/2017-08-01/network/loadbalancersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// LoadBalancersClient is the network Client
-type LoadBalancersClient struct {
+// LoadBalancersGroupClient is the network Client
+type LoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancersClient creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClient(subscriptionID string) LoadBalancersClient {
-	return NewLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancersGroupClient creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClient(subscriptionID string) LoadBalancersGroupClient {
+	return NewLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancersClientWithBaseURI creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersClient {
-	return LoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancersGroupClientWithBaseURI creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersGroupClient {
+	return LoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // parameters is parameters supplied to the create or update load balancer operation.
-func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
+func (client LoadBalancersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (
 // Delete deletes the specified load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) DeleteSender(req *http.Request) (future LoadBalancersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBa
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LoadBalancersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. expand
 // is expands referenced resources.
-func (client LoadBalancersClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client LoadBalancersClient) GetResponder(resp *http.Response) (result Load
 // List gets all the load balancers in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LoadBalancersClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client LoadBalancersClient) ListResponder(resp *http.Response) (result Loa
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the load balancers in a subscription.
-func (client LoadBalancersClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Re
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerLis
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/localnetworkgateways.go b/services/network/mgmt/2017-08-01/network/localnetworkgatewaysgroup.go
similarity index 71%
rename from services/network/mgmt/2017-08-01/network/localnetworkgateways.go
rename to services/network/mgmt/2017-08-01/network/localnetworkgatewaysgroup.go
index 6692993e39ee..5565cdda832b 100644
--- a/services/network/mgmt/2017-08-01/network/localnetworkgateways.go
+++ b/services/network/mgmt/2017-08-01/network/localnetworkgatewaysgroup.go
@@ -25,43 +25,43 @@ import (
 	"net/http"
 )
 
-// LocalNetworkGatewaysClient is the network Client
-type LocalNetworkGatewaysClient struct {
+// LocalNetworkGatewaysGroupClient is the network Client
+type LocalNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewLocalNetworkGatewaysClient creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
-	return NewLocalNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLocalNetworkGatewaysGroupClient creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClient(subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return NewLocalNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLocalNetworkGatewaysClientWithBaseURI creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
-	return LocalNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLocalNetworkGatewaysGroupClientWithBaseURI creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return LocalNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a local network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway. parameters is parameters supplied to the create or update local network gateway operation.
-func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}},
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, localNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -69,7 +69,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -93,7 +93,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -108,7 +108,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -123,22 +123,22 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Resp
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Delete", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Delete", err.Error())
 	}
 
 	req, err := client.DeletePreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -146,7 +146,7 @@ func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -168,7 +168,7 @@ func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -183,7 +183,7 @@ func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -197,36 +197,36 @@ func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Get", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Get", err.Error())
 	}
 
 	req, err := client.GetPreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -248,14 +248,14 @@ func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -269,31 +269,31 @@ func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (resu
 // List gets all the local network gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LocalNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
+func (client LocalNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -314,14 +314,14 @@ func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,10 +333,10 @@ func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
 	req, err := lastResults.localNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -344,17 +344,17 @@ func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetwor
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/models.go b/services/network/mgmt/2017-08-01/network/models.go
index 23e20f7ba1c0..ecab3241c57e 100644
--- a/services/network/mgmt/2017-08-01/network/models.go
+++ b/services/network/mgmt/2017-08-01/network/models.go
@@ -36,6 +36,11 @@ const (
 	Deny Access = "Deny"
 )
 
+// PossibleAccessValues returns an array of possible values for the Access const type.
+func PossibleAccessValues() [2]Access {
+	return [2]Access{Allow, Deny}
+}
+
 // ApplicationGatewayBackendHealthServerHealth enumerates the values for application gateway backend health
 // server health.
 type ApplicationGatewayBackendHealthServerHealth string
@@ -53,6 +58,11 @@ const (
 	Up ApplicationGatewayBackendHealthServerHealth = "Up"
 )
 
+// PossibleApplicationGatewayBackendHealthServerHealthValues returns an array of possible values for the ApplicationGatewayBackendHealthServerHealth const type.
+func PossibleApplicationGatewayBackendHealthServerHealthValues() [5]ApplicationGatewayBackendHealthServerHealth {
+	return [5]ApplicationGatewayBackendHealthServerHealth{Down, Draining, Partial, Unknown, Up}
+}
+
 // ApplicationGatewayCookieBasedAffinity enumerates the values for application gateway cookie based affinity.
 type ApplicationGatewayCookieBasedAffinity string
 
@@ -63,6 +73,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayFirewallMode enumerates the values for application gateway firewall mode.
 type ApplicationGatewayFirewallMode string
 
@@ -73,6 +88,11 @@ const (
 	Prevention ApplicationGatewayFirewallMode = "Prevention"
 )
 
+// PossibleApplicationGatewayFirewallModeValues returns an array of possible values for the ApplicationGatewayFirewallMode const type.
+func PossibleApplicationGatewayFirewallModeValues() [2]ApplicationGatewayFirewallMode {
+	return [2]ApplicationGatewayFirewallMode{Detection, Prevention}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -87,6 +107,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -97,6 +122,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRedirectType enumerates the values for application gateway redirect type.
 type ApplicationGatewayRedirectType string
 
@@ -111,6 +141,11 @@ const (
 	Temporary ApplicationGatewayRedirectType = "Temporary"
 )
 
+// PossibleApplicationGatewayRedirectTypeValues returns an array of possible values for the ApplicationGatewayRedirectType const type.
+func PossibleApplicationGatewayRedirectTypeValues() [4]ApplicationGatewayRedirectType {
+	return [4]ApplicationGatewayRedirectType{Found, Permanent, SeeOther, Temporary}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -122,6 +157,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -138,6 +178,11 @@ const (
 	WAFMedium ApplicationGatewaySkuName = "WAF_Medium"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [5]ApplicationGatewaySkuName {
+	return [5]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall, WAFLarge, WAFMedium}
+}
+
 // ApplicationGatewaySslCipherSuite enumerates the values for application gateway ssl cipher suite.
 type ApplicationGatewaySslCipherSuite string
 
@@ -194,6 +239,11 @@ const (
 	TLSRSAWITHAES256GCMSHA384 ApplicationGatewaySslCipherSuite = "TLS_RSA_WITH_AES_256_GCM_SHA384"
 )
 
+// PossibleApplicationGatewaySslCipherSuiteValues returns an array of possible values for the ApplicationGatewaySslCipherSuite const type.
+func PossibleApplicationGatewaySslCipherSuiteValues() [25]ApplicationGatewaySslCipherSuite {
+	return [25]ApplicationGatewaySslCipherSuite{TLSDHEDSSWITHAES128CBCSHA, TLSDHEDSSWITHAES128CBCSHA256, TLSDHEDSSWITHAES256CBCSHA, TLSDHEDSSWITHAES256CBCSHA256, TLSDHERSAWITHAES128CBCSHA, TLSDHERSAWITHAES128GCMSHA256, TLSDHERSAWITHAES256CBCSHA, TLSDHERSAWITHAES256GCMSHA384, TLSECDHEECDSAWITHAES128CBCSHA, TLSECDHEECDSAWITHAES128CBCSHA256, TLSECDHEECDSAWITHAES128GCMSHA256, TLSECDHEECDSAWITHAES256CBCSHA, TLSECDHEECDSAWITHAES256CBCSHA384, TLSECDHEECDSAWITHAES256GCMSHA384, TLSECDHERSAWITHAES128CBCSHA, TLSECDHERSAWITHAES128CBCSHA256, TLSECDHERSAWITHAES256CBCSHA, TLSECDHERSAWITHAES256CBCSHA384, TLSRSAWITH3DESEDECBCSHA, TLSRSAWITHAES128CBCSHA, TLSRSAWITHAES128CBCSHA256, TLSRSAWITHAES128GCMSHA256, TLSRSAWITHAES256CBCSHA, TLSRSAWITHAES256CBCSHA256, TLSRSAWITHAES256GCMSHA384}
+}
+
 // ApplicationGatewaySslPolicyName enumerates the values for application gateway ssl policy name.
 type ApplicationGatewaySslPolicyName string
 
@@ -206,6 +256,11 @@ const (
 	AppGwSslPolicy20170401S ApplicationGatewaySslPolicyName = "AppGwSslPolicy20170401S"
 )
 
+// PossibleApplicationGatewaySslPolicyNameValues returns an array of possible values for the ApplicationGatewaySslPolicyName const type.
+func PossibleApplicationGatewaySslPolicyNameValues() [3]ApplicationGatewaySslPolicyName {
+	return [3]ApplicationGatewaySslPolicyName{AppGwSslPolicy20150501, AppGwSslPolicy20170401, AppGwSslPolicy20170401S}
+}
+
 // ApplicationGatewaySslPolicyType enumerates the values for application gateway ssl policy type.
 type ApplicationGatewaySslPolicyType string
 
@@ -216,6 +271,11 @@ const (
 	Predefined ApplicationGatewaySslPolicyType = "Predefined"
 )
 
+// PossibleApplicationGatewaySslPolicyTypeValues returns an array of possible values for the ApplicationGatewaySslPolicyType const type.
+func PossibleApplicationGatewaySslPolicyTypeValues() [2]ApplicationGatewaySslPolicyType {
+	return [2]ApplicationGatewaySslPolicyType{Custom, Predefined}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -228,6 +288,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -238,6 +303,11 @@ const (
 	WAF ApplicationGatewayTier = "WAF"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [2]ApplicationGatewayTier {
+	return [2]ApplicationGatewayTier{Standard, WAF}
+}
+
 // AssociationType enumerates the values for association type.
 type AssociationType string
 
@@ -248,6 +318,11 @@ const (
 	Contains AssociationType = "Contains"
 )
 
+// PossibleAssociationTypeValues returns an array of possible values for the AssociationType const type.
+func PossibleAssociationTypeValues() [2]AssociationType {
+	return [2]AssociationType{Associated, Contains}
+}
+
 // AuthenticationMethod enumerates the values for authentication method.
 type AuthenticationMethod string
 
@@ -258,6 +333,11 @@ const (
 	EAPTLS AuthenticationMethod = "EAPTLS"
 )
 
+// PossibleAuthenticationMethodValues returns an array of possible values for the AuthenticationMethod const type.
+func PossibleAuthenticationMethodValues() [2]AuthenticationMethod {
+	return [2]AuthenticationMethod{EAPMSCHAPv2, EAPTLS}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -268,6 +348,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // BgpPeerState enumerates the values for bgp peer state.
 type BgpPeerState string
 
@@ -284,6 +369,11 @@ const (
 	BgpPeerStateUnknown BgpPeerState = "Unknown"
 )
 
+// PossibleBgpPeerStateValues returns an array of possible values for the BgpPeerState const type.
+func PossibleBgpPeerStateValues() [5]BgpPeerState {
+	return [5]BgpPeerState{BgpPeerStateConnected, BgpPeerStateConnecting, BgpPeerStateIdle, BgpPeerStateStopped, BgpPeerStateUnknown}
+}
+
 // ConnectionStatus enumerates the values for connection status.
 type ConnectionStatus string
 
@@ -298,6 +388,11 @@ const (
 	ConnectionStatusUnknown ConnectionStatus = "Unknown"
 )
 
+// PossibleConnectionStatusValues returns an array of possible values for the ConnectionStatus const type.
+func PossibleConnectionStatusValues() [4]ConnectionStatus {
+	return [4]ConnectionStatus{ConnectionStatusConnected, ConnectionStatusDegraded, ConnectionStatusDisconnected, ConnectionStatusUnknown}
+}
+
 // DhGroup enumerates the values for dh group.
 type DhGroup string
 
@@ -320,6 +415,11 @@ const (
 	None DhGroup = "None"
 )
 
+// PossibleDhGroupValues returns an array of possible values for the DhGroup const type.
+func PossibleDhGroupValues() [8]DhGroup {
+	return [8]DhGroup{DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+}
+
 // Direction enumerates the values for direction.
 type Direction string
 
@@ -330,6 +430,11 @@ const (
 	Outbound Direction = "Outbound"
 )
 
+// PossibleDirectionValues returns an array of possible values for the Direction const type.
+func PossibleDirectionValues() [2]Direction {
+	return [2]Direction{Inbound, Outbound}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -344,6 +449,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -354,6 +464,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // EffectiveSecurityRuleProtocol enumerates the values for effective security rule protocol.
 type EffectiveSecurityRuleProtocol string
 
@@ -366,6 +481,11 @@ const (
 	UDP EffectiveSecurityRuleProtocol = "Udp"
 )
 
+// PossibleEffectiveSecurityRuleProtocolValues returns an array of possible values for the EffectiveSecurityRuleProtocol const type.
+func PossibleEffectiveSecurityRuleProtocolValues() [3]EffectiveSecurityRuleProtocol {
+	return [3]EffectiveSecurityRuleProtocol{All, TCP, UDP}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -381,6 +501,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -391,6 +516,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -403,6 +533,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -413,6 +548,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -423,6 +563,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IkeEncryption enumerates the values for ike encryption.
 type IkeEncryption string
 
@@ -439,6 +584,11 @@ const (
 	DES3 IkeEncryption = "DES3"
 )
 
+// PossibleIkeEncryptionValues returns an array of possible values for the IkeEncryption const type.
+func PossibleIkeEncryptionValues() [5]IkeEncryption {
+	return [5]IkeEncryption{AES128, AES192, AES256, DES, DES3}
+}
+
 // IkeIntegrity enumerates the values for ike integrity.
 type IkeIntegrity string
 
@@ -453,6 +603,11 @@ const (
 	SHA384 IkeIntegrity = "SHA384"
 )
 
+// PossibleIkeIntegrityValues returns an array of possible values for the IkeIntegrity const type.
+func PossibleIkeIntegrityValues() [4]IkeIntegrity {
+	return [4]IkeIntegrity{MD5, SHA1, SHA256, SHA384}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -463,6 +618,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IpsecEncryption enumerates the values for ipsec encryption.
 type IpsecEncryption string
 
@@ -487,6 +647,11 @@ const (
 	IpsecEncryptionNone IpsecEncryption = "None"
 )
 
+// PossibleIpsecEncryptionValues returns an array of possible values for the IpsecEncryption const type.
+func PossibleIpsecEncryptionValues() [9]IpsecEncryption {
+	return [9]IpsecEncryption{IpsecEncryptionAES128, IpsecEncryptionAES192, IpsecEncryptionAES256, IpsecEncryptionDES, IpsecEncryptionDES3, IpsecEncryptionGCMAES128, IpsecEncryptionGCMAES192, IpsecEncryptionGCMAES256, IpsecEncryptionNone}
+}
+
 // IpsecIntegrity enumerates the values for ipsec integrity.
 type IpsecIntegrity string
 
@@ -505,6 +670,11 @@ const (
 	IpsecIntegritySHA256 IpsecIntegrity = "SHA256"
 )
 
+// PossibleIpsecIntegrityValues returns an array of possible values for the IpsecIntegrity const type.
+func PossibleIpsecIntegrityValues() [6]IpsecIntegrity {
+	return [6]IpsecIntegrity{IpsecIntegrityGCMAES128, IpsecIntegrityGCMAES192, IpsecIntegrityGCMAES256, IpsecIntegrityMD5, IpsecIntegritySHA1, IpsecIntegritySHA256}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -515,6 +685,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // IssueType enumerates the values for issue type.
 type IssueType string
 
@@ -539,6 +714,11 @@ const (
 	IssueTypeUserDefinedRoute IssueType = "UserDefinedRoute"
 )
 
+// PossibleIssueTypeValues returns an array of possible values for the IssueType const type.
+func PossibleIssueTypeValues() [9]IssueType {
+	return [9]IssueType{IssueTypeAgentStopped, IssueTypeDNSResolution, IssueTypeGuestFirewall, IssueTypeNetworkSecurityRule, IssueTypePlatform, IssueTypePortThrottled, IssueTypeSocketBind, IssueTypeUnknown, IssueTypeUserDefinedRoute}
+}
+
 // LoadBalancerSkuName enumerates the values for load balancer sku name.
 type LoadBalancerSkuName string
 
@@ -549,6 +729,11 @@ const (
 	LoadBalancerSkuNameStandard LoadBalancerSkuName = "Standard"
 )
 
+// PossibleLoadBalancerSkuNameValues returns an array of possible values for the LoadBalancerSkuName const type.
+func PossibleLoadBalancerSkuNameValues() [2]LoadBalancerSkuName {
+	return [2]LoadBalancerSkuName{LoadBalancerSkuNameBasic, LoadBalancerSkuNameStandard}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -561,6 +746,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // NextHopType enumerates the values for next hop type.
 type NextHopType string
 
@@ -579,6 +769,11 @@ const (
 	NextHopTypeVnetLocal NextHopType = "VnetLocal"
 )
 
+// PossibleNextHopTypeValues returns an array of possible values for the NextHopType const type.
+func PossibleNextHopTypeValues() [6]NextHopType {
+	return [6]NextHopType{NextHopTypeHyperNetGateway, NextHopTypeInternet, NextHopTypeNone, NextHopTypeVirtualAppliance, NextHopTypeVirtualNetworkGateway, NextHopTypeVnetLocal}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -591,6 +786,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // Origin enumerates the values for origin.
 type Origin string
 
@@ -603,6 +803,11 @@ const (
 	OriginOutbound Origin = "Outbound"
 )
 
+// PossibleOriginValues returns an array of possible values for the Origin const type.
+func PossibleOriginValues() [3]Origin {
+	return [3]Origin{OriginInbound, OriginLocal, OriginOutbound}
+}
+
 // PcError enumerates the values for pc error.
 type PcError string
 
@@ -619,6 +824,11 @@ const (
 	StorageFailed PcError = "StorageFailed"
 )
 
+// PossiblePcErrorValues returns an array of possible values for the PcError const type.
+func PossiblePcErrorValues() [5]PcError {
+	return [5]PcError{AgentStopped, CaptureFailed, InternalError, LocalFileFailed, StorageFailed}
+}
+
 // PcProtocol enumerates the values for pc protocol.
 type PcProtocol string
 
@@ -631,6 +841,11 @@ const (
 	PcProtocolUDP PcProtocol = "UDP"
 )
 
+// PossiblePcProtocolValues returns an array of possible values for the PcProtocol const type.
+func PossiblePcProtocolValues() [3]PcProtocol {
+	return [3]PcProtocol{PcProtocolAny, PcProtocolTCP, PcProtocolUDP}
+}
+
 // PcStatus enumerates the values for pc status.
 type PcStatus string
 
@@ -647,6 +862,11 @@ const (
 	PcStatusUnknown PcStatus = "Unknown"
 )
 
+// PossiblePcStatusValues returns an array of possible values for the PcStatus const type.
+func PossiblePcStatusValues() [5]PcStatus {
+	return [5]PcStatus{PcStatusError, PcStatusNotStarted, PcStatusRunning, PcStatusStopped, PcStatusUnknown}
+}
+
 // PfsGroup enumerates the values for pfs group.
 type PfsGroup string
 
@@ -667,6 +887,11 @@ const (
 	PfsGroupPFS24 PfsGroup = "PFS24"
 )
 
+// PossiblePfsGroupValues returns an array of possible values for the PfsGroup const type.
+func PossiblePfsGroupValues() [7]PfsGroup {
+	return [7]PfsGroup{PfsGroupECP256, PfsGroupECP384, PfsGroupNone, PfsGroupPFS1, PfsGroupPFS2, PfsGroupPFS2048, PfsGroupPFS24}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -677,6 +902,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -687,6 +917,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // Protocol enumerates the values for protocol.
 type Protocol string
 
@@ -697,6 +932,11 @@ const (
 	ProtocolUDP Protocol = "UDP"
 )
 
+// PossibleProtocolValues returns an array of possible values for the Protocol const type.
+func PossibleProtocolValues() [2]Protocol {
+	return [2]Protocol{ProtocolTCP, ProtocolUDP}
+}
+
 // ProvisioningState enumerates the values for provisioning state.
 type ProvisioningState string
 
@@ -711,6 +951,11 @@ const (
 	ProvisioningStateUpdating ProvisioningState = "Updating"
 )
 
+// PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type.
+func PossibleProvisioningStateValues() [4]ProvisioningState {
+	return [4]ProvisioningState{ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateSucceeded, ProvisioningStateUpdating}
+}
+
 // PublicIPAddressSkuName enumerates the values for public ip address sku name.
 type PublicIPAddressSkuName string
 
@@ -721,6 +966,11 @@ const (
 	PublicIPAddressSkuNameStandard PublicIPAddressSkuName = "Standard"
 )
 
+// PossiblePublicIPAddressSkuNameValues returns an array of possible values for the PublicIPAddressSkuName const type.
+func PossiblePublicIPAddressSkuNameValues() [2]PublicIPAddressSkuName {
+	return [2]PublicIPAddressSkuName{PublicIPAddressSkuNameBasic, PublicIPAddressSkuNameStandard}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -737,6 +987,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -747,6 +1002,11 @@ const (
 	SecurityRuleAccessDeny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{SecurityRuleAccessAllow, SecurityRuleAccessDeny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -757,6 +1017,11 @@ const (
 	SecurityRuleDirectionOutbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{SecurityRuleDirectionInbound, SecurityRuleDirectionOutbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -769,6 +1034,11 @@ const (
 	SecurityRuleProtocolUDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{SecurityRuleProtocolAsterisk, SecurityRuleProtocolTCP, SecurityRuleProtocolUDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -783,6 +1053,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // Severity enumerates the values for severity.
 type Severity string
 
@@ -793,6 +1068,11 @@ const (
 	SeverityWarning Severity = "Warning"
 )
 
+// PossibleSeverityValues returns an array of possible values for the Severity const type.
+func PossibleSeverityValues() [2]Severity {
+	return [2]Severity{SeverityError, SeverityWarning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -803,6 +1083,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [2]TransportProtocol {
+	return [2]TransportProtocol{TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -817,6 +1102,11 @@ const (
 	VirtualNetworkGatewayConnectionStatusUnknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{VirtualNetworkGatewayConnectionStatusConnected, VirtualNetworkGatewayConnectionStatusConnecting, VirtualNetworkGatewayConnectionStatusNotConnected, VirtualNetworkGatewayConnectionStatusUnknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -831,6 +1121,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -851,6 +1146,11 @@ const (
 	VirtualNetworkGatewaySkuNameVpnGw3 VirtualNetworkGatewaySkuName = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [7]VirtualNetworkGatewaySkuName {
+	return [7]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance, VirtualNetworkGatewaySkuNameVpnGw1, VirtualNetworkGatewaySkuNameVpnGw2, VirtualNetworkGatewaySkuNameVpnGw3}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -871,6 +1171,11 @@ const (
 	VirtualNetworkGatewaySkuTierVpnGw3 VirtualNetworkGatewaySkuTier = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [7]VirtualNetworkGatewaySkuTier {
+	return [7]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance, VirtualNetworkGatewaySkuTierVpnGw1, VirtualNetworkGatewaySkuTierVpnGw2, VirtualNetworkGatewaySkuTierVpnGw3}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -881,6 +1186,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -893,6 +1203,11 @@ const (
 	Initiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{Connected, Disconnected, Initiated}
+}
+
 // VpnClientProtocol enumerates the values for vpn client protocol.
 type VpnClientProtocol string
 
@@ -903,6 +1218,11 @@ const (
 	SSTP VpnClientProtocol = "SSTP"
 )
 
+// PossibleVpnClientProtocolValues returns an array of possible values for the VpnClientProtocol const type.
+func PossibleVpnClientProtocolValues() [2]VpnClientProtocol {
+	return [2]VpnClientProtocol{IkeV2, SSTP}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -913,6 +1233,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
@@ -2604,29 +2929,29 @@ type ApplicationGatewayRequestRoutingRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// ApplicationGatewaysBackendHealthFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupBackendHealthFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysBackendHealthFuture struct {
+type ApplicationGatewaysGroupBackendHealthFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGatewaysClient) (agbh ApplicationGatewayBackendHealth, err error) {
+func (future ApplicationGatewaysGroupBackendHealthFuture) Result(client ApplicationGatewaysGroupClient) (agbh ApplicationGatewayBackendHealth, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysBackendHealthFuture")
+		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupBackendHealthFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		agbh, err = client.BackendHealthResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2643,39 +2968,39 @@ func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGa
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	agbh, err = client.BackendHealthResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysCreateOrUpdateFuture struct {
+type ApplicationGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) {
+func (future ApplicationGatewaysGroupCreateOrUpdateFuture) Result(client ApplicationGatewaysGroupClient) (ag ApplicationGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysCreateOrUpdateFuture")
+		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ag, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2692,39 +3017,39 @@ func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationG
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ag, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ApplicationGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ApplicationGatewaysDeleteFuture struct {
+type ApplicationGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
+func (future ApplicationGatewaysGroupDeleteFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2741,12 +3066,110 @@ func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStartFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStartFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStartFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStartFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StartResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StartResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStopFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStopFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStopFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StopResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StopResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -2920,104 +3343,6 @@ type ApplicationGatewaySslPredefinedPolicyPropertiesFormat struct {
 	MinProtocolVersion ApplicationGatewaySslProtocol `json:"minProtocolVersion,omitempty"`
 }
 
-// ApplicationGatewaysStartFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStartFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStartFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StartResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StartResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
-// ApplicationGatewaysStopFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStopFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStopFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StopResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StopResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
 // ApplicationGatewayURLPathMap urlPathMaps give a url path to the backend mapping information for
 // PathBasedRouting.
 type ApplicationGatewayURLPathMap struct {
@@ -4139,29 +4464,29 @@ func (erca *ExpressRouteCircuitAuthorization) UnmarshalJSON(body []byte) error {
 	return nil
 }
 
-// ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results
-// of a long-running operation.
-type ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (erca ExpressRouteCircuitAuthorization, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (erca ExpressRouteCircuitAuthorization, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture")
+		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erca, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4178,39 +4503,39 @@ func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(clien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erca, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitAuthorizationsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitAuthorizationsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitAuthorizationsDeleteFuture struct {
+type ExpressRouteCircuitAuthorizationsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4227,12 +4552,12 @@ func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client Expres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -4560,29 +4885,29 @@ type ExpressRouteCircuitPeeringPropertiesFormat struct {
 	Ipv6PeeringConfig *Ipv6ExpressRouteCircuitPeeringConfig `json:"ipv6PeeringConfig,omitempty"`
 }
 
-// ExpressRouteCircuitPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitPeeringsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsClient) (ercp ExpressRouteCircuitPeering, err error) {
+func (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ercp ExpressRouteCircuitPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture")
+		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4599,39 +4924,39 @@ func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client Expr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitPeeringsDeleteFuture struct {
+type ExpressRouteCircuitPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRouteCircuitPeeringsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitPeeringsGroupDeleteFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4648,12 +4973,12 @@ func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRoute
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -4719,29 +5044,39 @@ type ExpressRouteCircuitsArpTableListResult struct {
 	NextLink *string `json:"nextLink,omitempty"`
 }
 
-// ExpressRouteCircuitsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
+type ExpressRouteCircuitServiceProviderProperties struct {
+	// ServiceProviderName - The serviceProviderName.
+	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
+	// PeeringLocation - The peering location.
+	PeeringLocation *string `json:"peeringLocation,omitempty"`
+	// BandwidthInMbps - The BandwidthInMbps.
+	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
+}
+
+// ExpressRouteCircuitsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsCreateOrUpdateFuture struct {
+type ExpressRouteCircuitsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) {
+func (future ExpressRouteCircuitsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitsGroupClient) (erc ExpressRouteCircuit, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsCreateOrUpdateFuture")
+		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4758,39 +5093,39 @@ func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRout
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ExpressRouteCircuitsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ExpressRouteCircuitsDeleteFuture struct {
+type ExpressRouteCircuitsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuitsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitsGroupDeleteFuture) Result(client ExpressRouteCircuitsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4807,59 +5142,39 @@ func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuit
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
-type ExpressRouteCircuitServiceProviderProperties struct {
-	// ServiceProviderName - The serviceProviderName.
-	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
-	// PeeringLocation - The peering location.
-	PeeringLocation *string `json:"peeringLocation,omitempty"`
-	// BandwidthInMbps - The BandwidthInMbps.
-	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
-}
-
-// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
-type ExpressRouteCircuitSku struct {
-	// Name - The name of the SKU.
-	Name *string `json:"name,omitempty"`
-	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
-	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
-	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
-	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
-}
-
-// ExpressRouteCircuitsListArpTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListArpTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListArpTableFuture struct {
+type ExpressRouteCircuitsGroupListArpTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteCircuitsClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListArpTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListArpTableFuture")
+		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListArpTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercatlr, err = client.ListArpTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4876,39 +5191,39 @@ func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercatlr, err = client.ListArpTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListRoutesTableFuture struct {
+type ExpressRouteCircuitsGroupListRoutesTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRouteCircuitsClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableFuture")
+		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtlr, err = client.ListRoutesTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4925,39 +5240,39 @@ func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtlr, err = client.ListRoutesTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitsListRoutesTableSummaryFuture struct {
+// ExpressRouteCircuitsGroupListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type ExpressRouteCircuitsGroupListRoutesTableSummaryFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableSummaryFuture")
+		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtslr, err = client.ListRoutesTableSummaryResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4974,16 +5289,26 @@ func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client Exp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtslr, err = client.ListRoutesTableSummaryResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
+type ExpressRouteCircuitSku struct {
+	// Name - The name of the SKU.
+	Name *string `json:"name,omitempty"`
+	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
+	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
+	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
+	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
+}
+
 // ExpressRouteCircuitsRoutesTableListResult response for ListRoutesTable associated with the Express Route
 // Circuits API.
 type ExpressRouteCircuitsRoutesTableListResult struct {
@@ -5690,29 +6015,29 @@ type InboundNatRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InboundNatRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type InboundNatRulesCreateOrUpdateFuture struct {
+// InboundNatRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type InboundNatRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesClient) (inr InboundNatRule, err error) {
+func (future InboundNatRulesGroupCreateOrUpdateFuture) Result(client InboundNatRulesGroupClient) (inr InboundNatRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesCreateOrUpdateFuture")
+		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		inr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5729,39 +6054,39 @@ func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	inr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InboundNatRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// InboundNatRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InboundNatRulesDeleteFuture struct {
+type InboundNatRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (ar autorest.Response, err error) {
+func (future InboundNatRulesGroupDeleteFuture) Result(client InboundNatRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5778,12 +6103,12 @@ func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -6353,29 +6678,29 @@ type InterfacePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InterfacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// InterfacesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InterfacesCreateOrUpdateFuture struct {
+type InterfacesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i Interface, err error) {
+func (future InterfacesGroupCreateOrUpdateFuture) Result(client InterfacesGroupClient) (i Interface, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return i, azure.NewAsyncOpIncompleteError("network.InterfacesCreateOrUpdateFuture")
+		return i, azure.NewAsyncOpIncompleteError("network.InterfacesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		i, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6392,38 +6717,39 @@ func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	i, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type InterfacesDeleteFuture struct {
+// InterfacesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type InterfacesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autorest.Response, err error) {
+func (future InterfacesGroupDeleteFuture) Result(client InterfacesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6440,39 +6766,39 @@ func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autores
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
+// InterfacesGroupGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type InterfacesGetEffectiveRouteTableFuture struct {
+type InterfacesGroupGetEffectiveRouteTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesClient) (erlr EffectiveRouteListResult, err error) {
+func (future InterfacesGroupGetEffectiveRouteTableFuture) Result(client InterfacesGroupClient) (erlr EffectiveRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGetEffectiveRouteTableFuture")
+		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupGetEffectiveRouteTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erlr, err = client.GetEffectiveRouteTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6489,39 +6815,39 @@ func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erlr, err = client.GetEffectiveRouteTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type InterfacesListEffectiveNetworkSecurityGroupsFuture struct {
+// InterfacesGroupListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type InterfacesGroupListEffectiveNetworkSecurityGroupsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
+func (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesGroupClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesListEffectiveNetworkSecurityGroupsFuture")
+		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6538,12 +6864,12 @@ func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client I
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -7341,29 +7667,29 @@ type LoadBalancerPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LoadBalancersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type LoadBalancersCreateOrUpdateFuture struct {
+// LoadBalancersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type LoadBalancersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) {
+func (future LoadBalancersGroupCreateOrUpdateFuture) Result(client LoadBalancersGroupClient) (lb LoadBalancer, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersCreateOrUpdateFuture")
+		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lb, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7380,38 +7706,39 @@ func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lb, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LoadBalancersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type LoadBalancersDeleteFuture struct {
+// LoadBalancersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type LoadBalancersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar autorest.Response, err error) {
+func (future LoadBalancersGroupDeleteFuture) Result(client LoadBalancersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7428,12 +7755,12 @@ func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -7774,29 +8101,29 @@ type LocalNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LocalNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// LocalNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type LocalNetworkGatewaysCreateOrUpdateFuture struct {
+type LocalNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) {
+func (future LocalNetworkGatewaysGroupCreateOrUpdateFuture) Result(client LocalNetworkGatewaysGroupClient) (lng LocalNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysCreateOrUpdateFuture")
+		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7813,39 +8140,39 @@ func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetwor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LocalNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// LocalNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type LocalNetworkGatewaysDeleteFuture struct {
+type LocalNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future LocalNetworkGatewaysGroupDeleteFuture) Result(client LocalNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7862,12 +8189,12 @@ func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGateway
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -8129,28 +8456,29 @@ type PacketCaptureResultProperties struct {
 	Filters            *[]PacketCaptureFilter        `json:"filters,omitempty"`
 }
 
-// PacketCapturesCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesCreateFuture struct {
+// PacketCapturesGroupCreateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupCreateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pcr PacketCaptureResult, err error) {
+func (future PacketCapturesGroupCreateFuture) Result(client PacketCapturesGroupClient) (pcr PacketCaptureResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesCreateFuture")
+		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupCreateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcr, err = client.CreateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8167,38 +8495,39 @@ func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pc
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcr, err = client.CreateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesDeleteFuture struct {
+// PacketCapturesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupDeleteFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8215,39 +8544,39 @@ func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// PacketCapturesGroupGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PacketCapturesGetStatusFuture struct {
+type PacketCapturesGroupGetStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
+func (future PacketCapturesGroupGetStatusFuture) Result(client PacketCapturesGroupClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGetStatusFuture")
+		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupGetStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcqsr, err = client.GetStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8264,38 +8593,39 @@ func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcqsr, err = client.GetStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesStopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesStopFuture struct {
+// PacketCapturesGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupStopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupStopFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesStopFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupStopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8312,12 +8642,12 @@ func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -8778,29 +9108,29 @@ type PublicIPAddressDNSSettings struct {
 	ReverseFqdn *string `json:"reverseFqdn,omitempty"`
 }
 
-// PublicIPAddressesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type PublicIPAddressesCreateOrUpdateFuture struct {
+// PublicIPAddressesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type PublicIPAddressesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) {
+func (future PublicIPAddressesGroupCreateOrUpdateFuture) Result(client PublicIPAddressesGroupClient) (pia PublicIPAddress, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesCreateOrUpdateFuture")
+		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pia, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8817,39 +9147,39 @@ func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pia, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PublicIPAddressesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// PublicIPAddressesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PublicIPAddressesDeleteFuture struct {
+type PublicIPAddressesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClient) (ar autorest.Response, err error) {
+func (future PublicIPAddressesGroupDeleteFuture) Result(client PublicIPAddressesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8866,12 +9196,12 @@ func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -9648,29 +9978,29 @@ type RouteFilterRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteFilterRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type RouteFilterRulesCreateOrUpdateFuture struct {
+// RouteFilterRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type RouteFilterRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupCreateOrUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesCreateOrUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9687,39 +10017,39 @@ func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRule
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesDeleteFuture struct {
+type RouteFilterRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) (ar autorest.Response, err error) {
+func (future RouteFilterRulesGroupDeleteFuture) Result(client RouteFilterRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9736,39 +10066,39 @@ func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesUpdateFuture struct {
+type RouteFilterRulesGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9785,39 +10115,39 @@ func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFiltersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFiltersCreateOrUpdateFuture struct {
+type RouteFiltersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupCreateOrUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersCreateOrUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9834,38 +10164,39 @@ func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersDeleteFuture struct {
+// RouteFiltersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar autorest.Response, err error) {
+func (future RouteFiltersGroupDeleteFuture) Result(client RouteFiltersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9882,38 +10213,39 @@ func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar aut
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersUpdateFuture struct {
+// RouteFiltersGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9930,12 +10262,12 @@ func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf Rou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10054,28 +10386,29 @@ type RoutePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RoutesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesCreateOrUpdateFuture struct {
+// RoutesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RoutesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, err error) {
+func (future RoutesGroupCreateOrUpdateFuture) Result(client RoutesGroupClient) (r Route, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return r, azure.NewAsyncOpIncompleteError("network.RoutesCreateOrUpdateFuture")
+		return r, azure.NewAsyncOpIncompleteError("network.RoutesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		r, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10092,38 +10425,38 @@ func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, e
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	r, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RoutesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesDeleteFuture struct {
+// RoutesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type RoutesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Response, err error) {
+func (future RoutesGroupDeleteFuture) Result(client RoutesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RoutesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RoutesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10140,12 +10473,12 @@ func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Respon
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10386,29 +10719,29 @@ type RouteTablePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteTablesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteTablesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteTablesCreateOrUpdateFuture struct {
+type RouteTablesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (rt RouteTable, err error) {
+func (future RouteTablesGroupCreateOrUpdateFuture) Result(client RouteTablesGroupClient) (rt RouteTable, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesCreateOrUpdateFuture")
+		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rt, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10425,38 +10758,39 @@ func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rt, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteTablesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteTablesDeleteFuture struct {
+// RouteTablesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteTablesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autorest.Response, err error) {
+func (future RouteTablesGroupDeleteFuture) Result(client RouteTablesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10473,12 +10807,12 @@ func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10732,29 +11066,29 @@ type SecurityGroupPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityGroupsCreateOrUpdateFuture struct {
+// SecurityGroupsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityGroupsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) {
+func (future SecurityGroupsGroupCreateOrUpdateFuture) Result(client SecurityGroupsGroupClient) (sg SecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsCreateOrUpdateFuture")
+		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sg, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10771,38 +11105,39 @@ func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sg, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityGroupsDeleteFuture struct {
+// SecurityGroupsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityGroupsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar autorest.Response, err error) {
+func (future SecurityGroupsGroupDeleteFuture) Result(client SecurityGroupsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10819,12 +11154,12 @@ func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11051,29 +11386,29 @@ type SecurityRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityRulesCreateOrUpdateFuture struct {
+// SecurityRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClient) (sr SecurityRule, err error) {
+func (future SecurityRulesGroupCreateOrUpdateFuture) Result(client SecurityRulesGroupClient) (sr SecurityRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesCreateOrUpdateFuture")
+		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11090,38 +11425,39 @@ func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityRulesDeleteFuture struct {
+// SecurityRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar autorest.Response, err error) {
+func (future SecurityRulesGroupDeleteFuture) Result(client SecurityRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11138,12 +11474,12 @@ func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11356,29 +11692,29 @@ type SubnetPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SubnetsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// SubnetsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type SubnetsCreateOrUpdateFuture struct {
+type SubnetsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet, err error) {
+func (future SubnetsGroupCreateOrUpdateFuture) Result(client SubnetsGroupClient) (s Subnet, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.SubnetsCreateOrUpdateFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.SubnetsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11395,38 +11731,38 @@ func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SubnetsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SubnetsDeleteFuture struct {
+// SubnetsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type SubnetsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Response, err error) {
+func (future SubnetsGroupDeleteFuture) Result(client SubnetsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11443,12 +11779,12 @@ func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Resp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12433,29 +12769,29 @@ type VirtualNetworkGatewayConnectionPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewayConnectionsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsCreateOrUpdateFuture struct {
+// VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngc VirtualNetworkGatewayConnection, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (vngc VirtualNetworkGatewayConnection, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture")
+		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vngc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12472,39 +12808,39 @@ func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vngc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewayConnectionsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewayConnectionsDeleteFuture struct {
+type VirtualNetworkGatewayConnectionsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client VirtualNetworkGatewayConnectionsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupDeleteFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12521,39 +12857,39 @@ func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsResetSharedKeyFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsResetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (crsk ConnectionResetSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (crsk ConnectionResetSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture")
+		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		crsk, err = client.ResetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12570,39 +12906,39 @@ func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	crsk, err = client.ResetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsSetSharedKeyFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewayConnectionsSetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (csk ConnectionSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (csk ConnectionSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture")
+		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		csk, err = client.SetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12619,12 +12955,12 @@ func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client V
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	csk, err = client.SetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12937,29 +13273,29 @@ type VirtualNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysCreateOrUpdateFuture struct {
+type VirtualNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysCreateOrUpdateFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12976,39 +13312,39 @@ func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysDeleteFuture struct {
+// VirtualNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewaysGroupDeleteFuture) Result(client VirtualNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13025,39 +13361,39 @@ func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGat
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewaysGeneratevpnclientpackageFuture struct {
+// VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GeneratevpnclientpackageResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13074,39 +13410,39 @@ func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GeneratevpnclientpackageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGenerateVpnProfileFuture struct {
+// VirtualNetworkGatewaysGroupGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGenerateVpnProfileFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGenerateVpnProfileFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GenerateVpnProfileResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13123,39 +13459,39 @@ func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client Virtu
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GenerateVpnProfileResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGetAdvertisedRoutesFuture struct {
+// VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetAdvertisedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13172,39 +13508,39 @@ func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client Virt
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetAdvertisedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetBgpPeerStatusFuture struct {
+type VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysClient) (bpslr BgpPeerStatusListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysGroupClient) (bpslr BgpPeerStatusListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetBgpPeerStatusFuture")
+		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		bpslr, err = client.GetBgpPeerStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13221,39 +13557,39 @@ func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	bpslr, err = client.GetBgpPeerStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetLearnedRoutesFuture struct {
+type VirtualNetworkGatewaysGroupGetLearnedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetLearnedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetLearnedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13270,39 +13606,39 @@ func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetLearnedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetVpnProfilePackageURLFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewaysGetVpnProfilePackageURLFuture struct {
+// VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GetVpnProfilePackageURLResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13319,49 +13655,39 @@ func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GetVpnProfilePackageURLResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
-type VirtualNetworkGatewaySku struct {
-	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
-	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
-	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
-	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
-	// Capacity - The capacity.
-	Capacity *int32 `json:"capacity,omitempty"`
-}
-
-// VirtualNetworkGatewaysResetFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysResetFuture struct {
+// VirtualNetworkGatewaysGroupResetFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupResetFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupResetFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysResetFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupResetFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.ResetResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13378,16 +13704,26 @@ func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGate
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.ResetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
+type VirtualNetworkGatewaySku struct {
+	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
+	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
+	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
+	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
+	// Capacity - The capacity.
+	Capacity *int32 `json:"capacity,omitempty"`
+}
+
 // VirtualNetworkListResult response for the ListVirtualNetworks API service call.
 type VirtualNetworkListResult struct {
 	autorest.Response `json:"-"`
@@ -13777,29 +14113,29 @@ type VirtualNetworkPeeringPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkPeeringsCreateOrUpdateFuture struct {
+type VirtualNetworkPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsClient) (vnp VirtualNetworkPeering, err error) {
+func (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsGroupClient) (vnp VirtualNetworkPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsCreateOrUpdateFuture")
+		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vnp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13816,39 +14152,39 @@ func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vnp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkPeeringsDeleteFuture struct {
+// VirtualNetworkPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPeeringsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkPeeringsGroupDeleteFuture) Result(client VirtualNetworkPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13865,12 +14201,12 @@ func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPee
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -13891,29 +14227,29 @@ type VirtualNetworkPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworksCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworksCreateOrUpdateFuture struct {
+// VirtualNetworksGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworksGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) {
+func (future VirtualNetworksGroupCreateOrUpdateFuture) Result(client VirtualNetworksGroupClient) (vn VirtualNetwork, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksCreateOrUpdateFuture")
+		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vn, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13930,39 +14266,39 @@ func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vn, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworksDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// VirtualNetworksGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type VirtualNetworksDeleteFuture struct {
+type VirtualNetworksGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (ar autorest.Response, err error) {
+func (future VirtualNetworksGroupDeleteFuture) Result(client VirtualNetworksGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13979,12 +14315,12 @@ func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -14317,29 +14653,29 @@ type WatcherPropertiesFormat struct {
 	ProvisioningState ProvisioningState `json:"provisioningState,omitempty"`
 }
 
-// WatchersCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersCheckConnectivityFuture struct {
+type WatchersGroupCheckConnectivityFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci ConnectivityInformation, err error) {
+func (future WatchersGroupCheckConnectivityFuture) Result(client WatchersGroupClient) (ci ConnectivityInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ci, azure.NewAsyncOpIncompleteError("network.WatchersCheckConnectivityFuture")
+		return ci, azure.NewAsyncOpIncompleteError("network.WatchersGroupCheckConnectivityFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ci, err = client.CheckConnectivityResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14356,38 +14692,38 @@ func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ci, err = client.CheckConnectivityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersDeleteFuture struct {
+// WatchersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type WatchersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Response, err error) {
+func (future WatchersGroupDeleteFuture) Result(client WatchersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.WatchersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.WatchersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14404,39 +14740,39 @@ func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Re
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetFlowLogStatusFuture struct {
+type WatchersGroupGetFlowLogStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupGetFlowLogStatusFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGetFlowLogStatusFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetFlowLogStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.GetFlowLogStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14453,38 +14789,39 @@ func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.GetFlowLogStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersGetNextHopFuture struct {
+// WatchersGroupGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupGetNextHopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHopResult, err error) {
+func (future WatchersGroupGetNextHopFuture) Result(client WatchersGroupClient) (nhr NextHopResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGetNextHopFuture")
+		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetNextHopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		nhr, err = client.GetNextHopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14501,39 +14838,39 @@ func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHo
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	nhr, err = client.GetNextHopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetTroubleshootingFuture struct {
+type WatchersGroupGetTroubleshootingFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14550,39 +14887,39 @@ func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
+// WatchersGroupGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type WatchersGetTroubleshootingResultFuture struct {
+type WatchersGroupGetTroubleshootingResultFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingResultFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingResultFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingResultFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResultResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14599,39 +14936,39 @@ func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResultResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetVMSecurityRulesFuture struct {
+type WatchersGroupGetVMSecurityRulesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sgvr SecurityGroupViewResult, err error) {
+func (future WatchersGroupGetVMSecurityRulesFuture) Result(client WatchersGroupClient) (sgvr SecurityGroupViewResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGetVMSecurityRulesFuture")
+		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetVMSecurityRulesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sgvr, err = client.GetVMSecurityRulesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14648,39 +14985,39 @@ func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sg
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sgvr, err = client.GetVMSecurityRulesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type WatchersSetFlowLogConfigurationFuture struct {
+// WatchersGroupSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type WatchersGroupSetFlowLogConfigurationFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupSetFlowLogConfigurationFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersSetFlowLogConfigurationFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupSetFlowLogConfigurationFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.SetFlowLogConfigurationResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14697,38 +15034,39 @@ func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.SetFlowLogConfigurationResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersVerifyIPFlowFuture struct {
+// WatchersGroupVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupVerifyIPFlowFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr VerificationIPFlowResult, err error) {
+func (future WatchersGroupVerifyIPFlowFuture) Result(client WatchersGroupClient) (vifr VerificationIPFlowResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersVerifyIPFlowFuture")
+		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersGroupVerifyIPFlowFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vifr, err = client.VerifyIPFlowResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14745,12 +15083,12 @@ func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr Ver
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vifr, err = client.VerifyIPFlowResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/packetcaptures.go b/services/network/mgmt/2017-08-01/network/packetcapturesgroup.go
similarity index 71%
rename from services/network/mgmt/2017-08-01/network/packetcaptures.go
rename to services/network/mgmt/2017-08-01/network/packetcapturesgroup.go
index f0761dfcb7a3..9254a1a7a382 100644
--- a/services/network/mgmt/2017-08-01/network/packetcaptures.go
+++ b/services/network/mgmt/2017-08-01/network/packetcapturesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// PacketCapturesClient is the network Client
-type PacketCapturesClient struct {
+// PacketCapturesGroupClient is the network Client
+type PacketCapturesGroupClient struct {
 	BaseClient
 }
 
-// NewPacketCapturesClient creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
-	return NewPacketCapturesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPacketCapturesGroupClient creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClient(subscriptionID string) PacketCapturesGroupClient {
+	return NewPacketCapturesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPacketCapturesClientWithBaseURI creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
-	return PacketCapturesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPacketCapturesGroupClientWithBaseURI creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesGroupClient {
+	return PacketCapturesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Create create and start a packet capture on the specified VM.
@@ -45,25 +45,25 @@ func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) P
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session. parameters is parameters that define the create
 // packet capture operation.
-func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesGroupCreateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PacketCaptureParameters", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.PacketCaptureParameters.Target", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "parameters.PacketCaptureParameters.StorageLocation", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PacketCapturesClient", "Create", err.Error())
+		return result, validation.NewError("network.PacketCapturesGroupClient", "Create", err.Error())
 	}
 
 	req, err := client.CreatePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName
 }
 
 // CreatePreparer prepares the Create request.
-func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
+func (client PacketCapturesGroupClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -96,7 +96,7 @@ func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceG
 
 // CreateSender sends the Create request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) CreateSender(req *http.Request) (future PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) CreateSender(req *http.Request) (future PacketCapturesGroupCreateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PacketCapturesClient) CreateSender(req *http.Request) (future Packe
 
 // CreateResponder handles the response to the Create request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -166,7 +166,7 @@ func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) DeleteSender(req *http.Request) (future PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) DeleteSender(req *http.Request) (future PacketCapturesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client PacketCapturesClient) DeleteSender(req *http.Request) (future Packe
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -241,14 +241,14 @@ func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -263,16 +263,16 @@ func (client PacketCapturesClient) GetResponder(resp *http.Response) (result Pac
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource. packetCaptureName is the name given to the packet capture session.
-func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupGetStatusFuture, err error) {
 	req, err := client.GetStatusPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -280,7 +280,7 @@ func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupN
 }
 
 // GetStatusPreparer prepares the GetStatus request.
-func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -303,7 +303,7 @@ func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resour
 
 // GetStatusSender sends the GetStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatusSender(req *http.Request) (future PacketCapturesGroupGetStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -318,7 +318,7 @@ func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future Pa
 
 // GetStatusResponder handles the response to the GetStatus request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
+func (client PacketCapturesGroupClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource.
-func (client PacketCapturesClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -378,14 +378,14 @@ func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -400,16 +400,16 @@ func (client PacketCapturesClient) ListResponder(resp *http.Response) (result Pa
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -417,7 +417,7 @@ func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName s
 }
 
 // StopPreparer prepares the Stop request.
-func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -440,7 +440,7 @@ func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGro
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) StopSender(req *http.Request) (future PacketCapturesGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -455,7 +455,7 @@ func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketC
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-08-01/network/publicipaddresses.go b/services/network/mgmt/2017-08-01/network/publicipaddressesgroup.go
similarity index 70%
rename from services/network/mgmt/2017-08-01/network/publicipaddresses.go
rename to services/network/mgmt/2017-08-01/network/publicipaddressesgroup.go
index 281aed372ee5..a0f37400831a 100644
--- a/services/network/mgmt/2017-08-01/network/publicipaddresses.go
+++ b/services/network/mgmt/2017-08-01/network/publicipaddressesgroup.go
@@ -25,26 +25,26 @@ import (
 	"net/http"
 )
 
-// PublicIPAddressesClient is the network Client
-type PublicIPAddressesClient struct {
+// PublicIPAddressesGroupClient is the network Client
+type PublicIPAddressesGroupClient struct {
 	BaseClient
 }
 
-// NewPublicIPAddressesClient creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
-	return NewPublicIPAddressesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPublicIPAddressesGroupClient creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClient(subscriptionID string) PublicIPAddressesGroupClient {
+	return NewPublicIPAddressesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPublicIPAddressesClientWithBaseURI creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
-	return PublicIPAddressesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPublicIPAddressesGroupClientWithBaseURI creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesGroupClient {
+	return PublicIPAddressesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a static or dynamic public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address.
 // parameters is parameters supplied to the create or update public IP address operation.
-func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat", Name: validation.Null, Rule: false,
@@ -53,18 +53,18 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 						Chain: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat.IPConfiguration.IPConfigurationPropertiesFormat.PublicIPAddress", Name: validation.Null, Rule: false, Chain: nil}}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PublicIPAddressesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.PublicIPAddressesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, publicIPAddressName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -72,7 +72,7 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -96,7 +96,7 @@ func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (f
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -125,16 +125,16 @@ func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Respons
 // Delete deletes the specified public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet.
-func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, publicIPAddressName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -142,7 +142,7 @@ func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupN
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -164,7 +164,7 @@ func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resour
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) DeleteSender(req *http.Request) (future PublicIPAddressesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -179,7 +179,7 @@ func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future Pu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PublicIPAddressesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -193,30 +193,30 @@ func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet. expand is
 // expands referenced resources.
-func (client PublicIPAddressesClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -241,14 +241,14 @@ func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceG
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -265,30 +265,30 @@ func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. IPConfigurationName is the name of the IP configuration. publicIPAddressName is the name of
 // the public IP Address. expand is expands referenced resources.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetPublicIPAddressSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetPublicIPAddressResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressPreparer prepares the GetVirtualMachineScaleSetPublicIPAddress request.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -317,14 +317,14 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPr
 
 // GetVirtualMachineScaleSetPublicIPAddressSender sends the GetVirtualMachineScaleSetPublicIPAddress request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressResponder handles the response to the GetVirtualMachineScaleSetPublicIPAddress request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -338,31 +338,31 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressRe
 // List gets all public IP addresses in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client PublicIPAddressesClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -383,14 +383,14 @@ func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resource
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -402,10 +402,10 @@ func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -413,47 +413,47 @@ func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddres
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the public IP addresses in a subscription.
-func (client PublicIPAddressesClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -473,14 +473,14 @@ func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*htt
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -492,10 +492,10 @@ func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (res
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -503,17 +503,17 @@ func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAdd
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -523,31 +523,31 @@ func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (resu
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -569,14 +569,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 
 // ListVirtualMachineScaleSetPublicIPAddressesSender sends the ListVirtualMachineScaleSetPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -588,10 +588,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 }
 
 // listVirtualMachineScaleSetPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -599,17 +599,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddresse
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -620,31 +620,31 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the network
 // interface name. IPConfigurationName is the IP configuration name.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetVMPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -669,14 +669,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesSender sends the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -688,10 +688,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 }
 
 // listVirtualMachineScaleSetVMPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -699,17 +699,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddres
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/routefilterrules.go b/services/network/mgmt/2017-08-01/network/routefilterrulesgroup.go
similarity index 72%
rename from services/network/mgmt/2017-08-01/network/routefilterrules.go
rename to services/network/mgmt/2017-08-01/network/routefilterrulesgroup.go
index de97529b7fb8..916f6fa0535a 100644
--- a/services/network/mgmt/2017-08-01/network/routefilterrules.go
+++ b/services/network/mgmt/2017-08-01/network/routefilterrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// RouteFilterRulesClient is the network Client
-type RouteFilterRulesClient struct {
+// RouteFilterRulesGroupClient is the network Client
+type RouteFilterRulesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFilterRulesClient creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClient(subscriptionID string) RouteFilterRulesClient {
-	return NewRouteFilterRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFilterRulesGroupClient creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClient(subscriptionID string) RouteFilterRulesGroupClient {
+	return NewRouteFilterRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFilterRulesClientWithBaseURI creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesClient {
-	return RouteFilterRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFilterRulesGroupClientWithBaseURI creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesGroupClient {
+	return RouteFilterRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route filter.
@@ -45,25 +45,25 @@ func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the create or update
 // route filter rule operation.
-func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: routeFilterRuleParameters,
 			Constraints: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.RouteFilterRuleType", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.Communities", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.RouteFilterRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.RouteFilterRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourc
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -96,7 +96,7 @@ func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (fu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupNa
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -166,7 +166,7 @@ func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourc
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) DeleteSender(req *http.Request) (future RouteFilterRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future Rou
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFilterRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (resul
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -241,14 +241,14 @@ func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGr
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -262,31 +262,31 @@ func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result R
 // ListByRouteFilter gets all RouteFilterRules in a route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFilterRulesClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
 	result.fn = client.listByRouteFilterNextResults
 	req, err := client.ListByRouteFilterPreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.rfrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure sending request")
 		return
 	}
 
 	result.rfrlr, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByRouteFilterPreparer prepares the ListByRouteFilter request.
-func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -308,14 +308,14 @@ func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Conte
 
 // ListByRouteFilterSender sends the ListByRouteFilter request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByRouteFilterResponder handles the response to the ListByRouteFilter request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -327,10 +327,10 @@ func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Respo
 }
 
 // listByRouteFilterNextResults retrieves the next set of results, if any.
-func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
 	req, err := lastResults.routeFilterRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -338,17 +338,17 @@ func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults Ro
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByRouteFilterComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
 	result.page, err = client.ListByRouteFilter(ctx, resourceGroupName, routeFilterName)
 	return
 }
@@ -358,16 +358,16 @@ func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Conte
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the update route
 // filter rule operation.
-func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -375,7 +375,7 @@ func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupNa
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -400,7 +400,7 @@ func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourc
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) UpdateSender(req *http.Request) (future RouteFilterRulesGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -415,7 +415,7 @@ func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future Rou
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-08-01/network/routefilters.go b/services/network/mgmt/2017-08-01/network/routefiltersgroup.go
similarity index 66%
rename from services/network/mgmt/2017-08-01/network/routefilters.go
rename to services/network/mgmt/2017-08-01/network/routefiltersgroup.go
index 8bc7afefd190..13ef55a5430f 100644
--- a/services/network/mgmt/2017-08-01/network/routefilters.go
+++ b/services/network/mgmt/2017-08-01/network/routefiltersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteFiltersClient is the network Client
-type RouteFiltersClient struct {
+// RouteFiltersGroupClient is the network Client
+type RouteFiltersGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFiltersClient creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
-	return NewRouteFiltersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFiltersGroupClient creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClient(subscriptionID string) RouteFiltersGroupClient {
+	return NewRouteFiltersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFiltersClientWithBaseURI creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
-	return RouteFiltersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFiltersGroupClientWithBaseURI creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersGroupClient {
+	return RouteFiltersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route filter in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the create or update route filter operation.
-func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGro
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -84,7 +84,7 @@ func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, res
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (r
 // Delete deletes the specified route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName s
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -152,7 +152,7 @@ func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGro
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) DeleteSender(req *http.Request) (future RouteFiltersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFiltersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result au
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. expand is
 // expands referenced express route bgp peering resources.
-func (client RouteFiltersClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -229,14 +229,14 @@ func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupN
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -248,31 +248,31 @@ func (client RouteFiltersClient) GetResponder(resp *http.Response) (result Route
 }
 
 // List gets all route filters in a subscription.
-func (client RouteFiltersClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -292,14 +292,14 @@ func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Reques
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -311,10 +311,10 @@ func (client RouteFiltersClient) ListResponder(resp *http.Response) (result Rout
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -322,17 +322,17 @@ func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResu
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
@@ -340,31 +340,31 @@ func (client RouteFiltersClient) ListComplete(ctx context.Context) (result Route
 // ListByResourceGroup gets all route filters in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteFiltersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listByResourceGroupNextResults
 	req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByResourceGroupPreparer prepares the ListByResourceGroup request.
-func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -385,14 +385,14 @@ func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context
 
 // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Respons
 }
 
 // listByResourceGroupNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults Rout
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.ListByResourceGroup(ctx, resourceGroupName)
 	return
 }
@@ -434,16 +434,16 @@ func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the update route filter operation.
-func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName s
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -475,7 +475,7 @@ func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGro
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) UpdateSender(req *http.Request) (future RouteFiltersGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFi
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-08-01/network/routes.go b/services/network/mgmt/2017-08-01/network/routesgroup.go
similarity index 69%
rename from services/network/mgmt/2017-08-01/network/routes.go
rename to services/network/mgmt/2017-08-01/network/routesgroup.go
index 1bfc0ce7b7f0..86ac686593d4 100644
--- a/services/network/mgmt/2017-08-01/network/routes.go
+++ b/services/network/mgmt/2017-08-01/network/routesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RoutesClient is the network Client
-type RoutesClient struct {
+// RoutesGroupClient is the network Client
+type RoutesGroupClient struct {
 	BaseClient
 }
 
-// NewRoutesClient creates an instance of the RoutesClient client.
-func NewRoutesClient(subscriptionID string) RoutesClient {
-	return NewRoutesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRoutesGroupClient creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClient(subscriptionID string) RoutesGroupClient {
+	return NewRoutesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRoutesClientWithBaseURI creates an instance of the RoutesClient client.
-func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
-	return RoutesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRoutesGroupClientWithBaseURI creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClientWithBaseURI(baseURI string, subscriptionID string) RoutesGroupClient {
+	return RoutesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route. routeParameters is parameters supplied to the create or update route operation.
-func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, routeName, routeParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
+func (client RoutesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -85,7 +85,7 @@ func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceG
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdateSender(req *http.Request) (future RoutesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -100,7 +100,7 @@ func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future Route
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -115,16 +115,16 @@ func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -132,7 +132,7 @@ func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -155,7 +155,7 @@ func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) DeleteSender(req *http.Request) (future RoutesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -170,7 +170,7 @@ func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteF
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RoutesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -184,30 +184,30 @@ func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
+func (client RoutesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -230,14 +230,14 @@ func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName st
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) GetResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err
 // List gets all routes in a route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RoutesClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
+func (client RoutesGroupClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RoutesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -297,14 +297,14 @@ func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName s
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
+func (client RoutesGroupClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -316,10 +316,10 @@ func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListR
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RoutesClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
+func (client RoutesGroupClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
 	req, err := lastResults.routeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -327,17 +327,17 @@ func (client RoutesClient) listNextResults(lastResults RouteListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RoutesClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
+func (client RoutesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, routeTableName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/routetables.go b/services/network/mgmt/2017-08-01/network/routetablesgroup.go
similarity index 65%
rename from services/network/mgmt/2017-08-01/network/routetables.go
rename to services/network/mgmt/2017-08-01/network/routetablesgroup.go
index 5e4c0eabd715..16426c7de9ea 100644
--- a/services/network/mgmt/2017-08-01/network/routetables.go
+++ b/services/network/mgmt/2017-08-01/network/routetablesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteTablesClient is the network Client
-type RouteTablesClient struct {
+// RouteTablesGroupClient is the network Client
+type RouteTablesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteTablesClient creates an instance of the RouteTablesClient client.
-func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
-	return NewRouteTablesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteTablesGroupClient creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClient(subscriptionID string) RouteTablesGroupClient {
+	return NewRouteTablesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteTablesClientWithBaseURI creates an instance of the RouteTablesClient client.
-func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
-	return RouteTablesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteTablesGroupClientWithBaseURI creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesGroupClient {
+	return RouteTablesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate create or updates a route table in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters
 // is parameters supplied to the create or update route table operation.
-func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGrou
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
+func (client RouteTablesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -84,7 +84,7 @@ func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, reso
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (re
 // Delete deletes the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName st
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -152,7 +152,7 @@ func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGrou
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) DeleteSender(req *http.Request) (future RouteTablesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTab
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteTablesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result aut
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. expand is
 // expands referenced resources.
-func (client RouteTablesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
+func (client RouteTablesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -229,14 +229,14 @@ func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupNa
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteT
 // List gets all route tables in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteTablesClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupN
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client RouteTablesClient) ListResponder(resp *http.Response) (result Route
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all route tables in a subscription.
-func (client RouteTablesClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Requ
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result Ro
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListRes
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/securitygroups.go b/services/network/mgmt/2017-08-01/network/securitygroupsgroup.go
similarity index 65%
rename from services/network/mgmt/2017-08-01/network/securitygroups.go
rename to services/network/mgmt/2017-08-01/network/securitygroupsgroup.go
index 9d44d1a10ac3..48d74442f540 100644
--- a/services/network/mgmt/2017-08-01/network/securitygroups.go
+++ b/services/network/mgmt/2017-08-01/network/securitygroupsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// SecurityGroupsClient is the network Client
-type SecurityGroupsClient struct {
+// SecurityGroupsGroupClient is the network Client
+type SecurityGroupsGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityGroupsClient creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
-	return NewSecurityGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityGroupsGroupClient creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClient(subscriptionID string) SecurityGroupsGroupClient {
+	return NewSecurityGroupsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityGroupsClientWithBaseURI creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
-	return SecurityGroupsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityGroupsGroupClientWithBaseURI creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsGroupClient {
+	return SecurityGroupsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network security group in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. parameters is parameters supplied to the create or update network security group operation.
-func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceG
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (futu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -114,16 +114,16 @@ func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -131,7 +131,7 @@ func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -153,7 +153,7 @@ func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) DeleteSender(req *http.Request) (future SecurityGroupsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -168,7 +168,7 @@ func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future Secur
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityGroupsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -182,30 +182,30 @@ func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. expand is expands referenced resources.
-func (client SecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -230,14 +230,14 @@ func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result Sec
 // List gets all network security groups in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client SecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -296,14 +296,14 @@ func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -315,10 +315,10 @@ func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result Se
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -326,47 +326,47 @@ func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupList
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network security groups in a subscription.
-func (client SecurityGroupsClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -386,14 +386,14 @@ func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.R
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -405,10 +405,10 @@ func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -416,17 +416,17 @@ func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupL
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/securityrules.go b/services/network/mgmt/2017-08-01/network/securityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-08-01/network/securityrules.go
rename to services/network/mgmt/2017-08-01/network/securityrulesgroup.go
index 9c57ebc019f4..b73133b15783 100644
--- a/services/network/mgmt/2017-08-01/network/securityrules.go
+++ b/services/network/mgmt/2017-08-01/network/securityrulesgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SecurityRulesClient is the network Client
-type SecurityRulesClient struct {
+// SecurityRulesGroupClient is the network Client
+type SecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityRulesClient creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
-	return NewSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityRulesGroupClient creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClient(subscriptionID string) SecurityRulesGroupClient {
+	return NewSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityRulesClientWithBaseURI creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
-	return SecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityRulesGroupClientWithBaseURI creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesGroupClient {
+	return SecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a security rule in the specified network security group.
@@ -44,16 +44,16 @@ func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) Se
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule. securityRuleParameters is parameters supplied
 // to the create or update network security rule operation.
-func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
+func (client SecurityRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -156,7 +156,7 @@ func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) DeleteSender(req *http.Request) (future SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) DeleteSender(req *http.Request) (future SecurityRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SecurityRulesClient) DeleteSender(req *http.Request) (future Securi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -231,14 +231,14 @@ func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -253,31 +253,31 @@ func (client SecurityRulesClient) GetResponder(resp *http.Response) (result Secu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client SecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -299,14 +299,14 @@ func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -318,10 +318,10 @@ func (client SecurityRulesClient) ListResponder(resp *http.Response) (result Sec
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -329,17 +329,17 @@ func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client SecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/subnets.go b/services/network/mgmt/2017-08-01/network/subnetsgroup.go
similarity index 69%
rename from services/network/mgmt/2017-08-01/network/subnets.go
rename to services/network/mgmt/2017-08-01/network/subnetsgroup.go
index 381fe5a8e620..18cd0df763f1 100644
--- a/services/network/mgmt/2017-08-01/network/subnets.go
+++ b/services/network/mgmt/2017-08-01/network/subnetsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SubnetsClient is the network Client
-type SubnetsClient struct {
+// SubnetsGroupClient is the network Client
+type SubnetsGroupClient struct {
 	BaseClient
 }
 
-// NewSubnetsClient creates an instance of the SubnetsClient client.
-func NewSubnetsClient(subscriptionID string) SubnetsClient {
-	return NewSubnetsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSubnetsGroupClient creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClient(subscriptionID string) SubnetsGroupClient {
+	return NewSubnetsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSubnetsClientWithBaseURI creates an instance of the SubnetsClient client.
-func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
-	return SubnetsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSubnetsGroupClientWithBaseURI creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClientWithBaseURI(baseURI string, subscriptionID string) SubnetsGroupClient {
+	return SubnetsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a subnet in the specified virtual network.
@@ -44,16 +44,16 @@ func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsC
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. subnetParameters is parameters supplied to the create or update subnet
 // operation.
-func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, subnetParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupNam
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
+func (client SubnetsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -86,7 +86,7 @@ func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resource
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateSender(req *http.Request) (future SubnetsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future Subn
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet.
-func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
+func (client SubnetsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -156,7 +156,7 @@ func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupNam
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) DeleteSender(req *http.Request) (future SubnetsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDelet
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SubnetsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autores
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. expand is expands referenced resources.
-func (client SubnetsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
+func (client SubnetsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
+func (client SubnetsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -234,14 +234,14 @@ func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName s
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) GetResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -255,31 +255,31 @@ func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, er
 // List gets all subnets in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client SubnetsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
+func (client SubnetsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.slr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.slr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client SubnetsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -301,14 +301,14 @@ func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,10 +320,10 @@ func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetLis
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
 	req, err := lastResults.subnetListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -331,17 +331,17 @@ func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (resul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SubnetsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
+func (client SubnetsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/usages.go b/services/network/mgmt/2017-08-01/network/usagesgroup.go
similarity index 64%
rename from services/network/mgmt/2017-08-01/network/usages.go
rename to services/network/mgmt/2017-08-01/network/usagesgroup.go
index dbb4b4a8a83e..84b7e0e2afc6 100644
--- a/services/network/mgmt/2017-08-01/network/usages.go
+++ b/services/network/mgmt/2017-08-01/network/usagesgroup.go
@@ -25,55 +25,55 @@ import (
 	"net/http"
 )
 
-// UsagesClient is the network Client
-type UsagesClient struct {
+// UsagesGroupClient is the network Client
+type UsagesGroupClient struct {
 	BaseClient
 }
 
-// NewUsagesClient creates an instance of the UsagesClient client.
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return NewUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewUsagesGroupClient creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClient(subscriptionID string) UsagesGroupClient {
+	return NewUsagesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewUsagesClientWithBaseURI creates an instance of the UsagesClient client.
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return UsagesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewUsagesGroupClientWithBaseURI creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClientWithBaseURI(baseURI string, subscriptionID string) UsagesGroupClient {
+	return UsagesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list network usages for a subscription.
 //
 // location is the location where resource usage is queried.
-func (client UsagesClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
+func (client UsagesGroupClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: location,
 			Constraints: []validation.Constraint{{Target: "location", Name: validation.Pattern, Rule: `^[-\w\._]+$`, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.UsagesClient", "List", err.Error())
+		return result, validation.NewError("network.UsagesGroupClient", "List", err.Error())
 	}
 
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ulr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ulr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client UsagesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -94,14 +94,14 @@ func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client UsagesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client UsagesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,10 +113,10 @@ func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesList
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
 	req, err := lastResults.usagesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -124,17 +124,17 @@ func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client UsagesClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
+func (client UsagesGroupClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/version.go b/services/network/mgmt/2017-08-01/network/version.go
index 5d866699cbee..63850a4b2460 100644
--- a/services/network/mgmt/2017-08-01/network/version.go
+++ b/services/network/mgmt/2017-08-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2017-08-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2017-08-01/network/virtualnetworkgatewayconnections.go b/services/network/mgmt/2017-08-01/network/virtualnetworkgatewayconnectionsgroup.go
similarity index 71%
rename from services/network/mgmt/2017-08-01/network/virtualnetworkgatewayconnections.go
rename to services/network/mgmt/2017-08-01/network/virtualnetworkgatewayconnectionsgroup.go
index 3709b8c353a5..28a1b58d0945 100644
--- a/services/network/mgmt/2017-08-01/network/virtualnetworkgatewayconnections.go
+++ b/services/network/mgmt/2017-08-01/network/virtualnetworkgatewayconnectionsgroup.go
@@ -25,20 +25,21 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewayConnectionsClient is the network Client
-type VirtualNetworkGatewayConnectionsClient struct {
+// VirtualNetworkGatewayConnectionsGroupClient is the network Client
+type VirtualNetworkGatewayConnectionsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewayConnectionsClient creates an instance of the VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return NewVirtualNetworkGatewayConnectionsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewayConnectionsGroupClient creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClient(subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewayConnectionsClientWithBaseURI creates an instance of the
-// VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return VirtualNetworkGatewayConnectionsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return VirtualNetworkGatewayConnectionsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway connection in the specified resource group.
@@ -46,7 +47,7 @@ func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscr
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection. parameters is parameters supplied to the create or update virtual network
 // gateway connection operation.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat", Name: validation.Null, Rule: true,
@@ -57,18 +58,18 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 					{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2", Name: validation.Null, Rule: false,
 						Chain: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -76,7 +77,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -100,7 +101,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -115,7 +116,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *h
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -130,16 +131,16 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -147,7 +148,7 @@ func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -169,7 +170,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +185,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Requ
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -198,30 +199,30 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -243,14 +244,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Con
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -266,30 +267,30 @@ func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection shared key name.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
 	req, err := client.GetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSharedKeySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSharedKeyPreparer prepares the GetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -311,14 +312,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx co
 
 // GetSharedKeySender sends the GetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSharedKeyResponder handles the response to the GetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,31 +334,31 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp
 // created.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewayConnectionsClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vngclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vngclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -378,14 +379,14 @@ func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Co
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -397,10 +398,10 @@ func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayConnectionListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -408,17 +409,17 @@ func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -430,25 +431,25 @@ func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Co
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection reset shared key Name. parameters is parameters supplied to the begin reset virtual network
 // gateway connection shared key operation through network resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.InclusiveMaximum, Rule: 128, Chain: nil},
 					{Target: "parameters.KeyLength", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", err.Error())
 	}
 
 	req, err := client.ResetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -456,7 +457,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.
 }
 
 // ResetSharedKeyPreparer prepares the ResetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -480,7 +481,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx
 
 // ResetSharedKeySender sends the ResetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -495,7 +496,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *h
 
 // ResetSharedKeyResponder handles the response to the ResetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -513,22 +514,22 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection name. parameters is parameters supplied to the Begin Set Virtual Network Gateway connection
 // Shared key operation throughNetwork resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Value", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", err.Error())
 	}
 
 	req, err := client.SetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -536,7 +537,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Co
 }
 
 // SetSharedKeyPreparer prepares the SetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -560,7 +561,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx co
 
 // SetSharedKeySender sends the SetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -575,7 +576,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *htt
 
 // SetSharedKeyResponder handles the response to the SetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-08-01/network/virtualnetworkgateways.go b/services/network/mgmt/2017-08-01/network/virtualnetworkgatewaysgroup.go
similarity index 72%
rename from services/network/mgmt/2017-08-01/network/virtualnetworkgateways.go
rename to services/network/mgmt/2017-08-01/network/virtualnetworkgatewaysgroup.go
index a5a663ecf467..978f7620b285 100644
--- a/services/network/mgmt/2017-08-01/network/virtualnetworkgateways.go
+++ b/services/network/mgmt/2017-08-01/network/virtualnetworkgatewaysgroup.go
@@ -25,41 +25,41 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewaysClient is the network Client
-type VirtualNetworkGatewaysClient struct {
+// VirtualNetworkGatewaysGroupClient is the network Client
+type VirtualNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewaysClient creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClient(subscriptionID string) VirtualNetworkGatewaysClient {
-	return NewVirtualNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewaysGroupClient creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClient(subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return NewVirtualNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewaysClientWithBaseURI creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysClient {
-	return VirtualNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewaysGroupClientWithBaseURI creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return VirtualNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to create or update virtual network gateway operation.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -67,7 +67,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -91,7 +91,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -106,7 +106,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -121,16 +121,16 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -138,7 +138,7 @@ func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -160,7 +160,7 @@ func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -175,7 +175,7 @@ func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -191,16 +191,16 @@ func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response)
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	req, err := client.GeneratevpnclientpackagePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GeneratevpnclientpackageSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -208,7 +208,7 @@ func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.
 }
 
 // GeneratevpnclientpackagePreparer prepares the Generatevpnclientpackage request.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -232,7 +232,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx
 
 // GeneratevpnclientpackageSender sends the Generatevpnclientpackage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -247,7 +247,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *h
 
 // GeneratevpnclientpackageResponder handles the response to the Generatevpnclientpackage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -264,16 +264,16 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	req, err := client.GenerateVpnProfilePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GenerateVpnProfileSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -281,7 +281,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Contex
 }
 
 // GenerateVpnProfilePreparer prepares the GenerateVpnProfile request.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -305,7 +305,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx contex
 
 // GenerateVpnProfileSender sends the GenerateVpnProfile request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -320,7 +320,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Re
 
 // GenerateVpnProfileResponder handles the response to the GenerateVpnProfile request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -335,30 +335,30 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *htt
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -380,14 +380,14 @@ func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -403,16 +403,16 @@ func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	req, err := client.GetAdvertisedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetAdvertisedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -420,7 +420,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Conte
 }
 
 // GetAdvertisedRoutesPreparer prepares the GetAdvertisedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -443,7 +443,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx conte
 
 // GetAdvertisedRoutesSender sends the GetAdvertisedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -458,7 +458,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.R
 
 // GetAdvertisedRoutesResponder handles the response to the GetAdvertisedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -473,16 +473,16 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer to retrieve the status of.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	req, err := client.GetBgpPeerStatusPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetBgpPeerStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -490,7 +490,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context,
 }
 
 // GetBgpPeerStatusPreparer prepares the GetBgpPeerStatus request.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -515,7 +515,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.
 
 // GetBgpPeerStatusSender sends the GetBgpPeerStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -530,7 +530,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Requ
 
 // GetBgpPeerStatusResponder handles the response to the GetBgpPeerStatus request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -546,16 +546,16 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	req, err := client.GetLearnedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetLearnedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -563,7 +563,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context,
 }
 
 // GetLearnedRoutesPreparer prepares the GetLearnedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -585,7 +585,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.
 
 // GetLearnedRoutesSender sends the GetLearnedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -600,7 +600,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Requ
 
 // GetLearnedRoutesResponder handles the response to the GetLearnedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -616,16 +616,16 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURL(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURL(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture, err error) {
 	req, err := client.GetVpnProfilePackageURLPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetVpnProfilePackageURL", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetVpnProfilePackageURL", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVpnProfilePackageURLSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetVpnProfilePackageURL", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetVpnProfilePackageURL", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -633,7 +633,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURL(ctx context.C
 }
 
 // GetVpnProfilePackageURLPreparer prepares the GetVpnProfilePackageURL request.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -655,7 +655,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLPreparer(ctx c
 
 // GetVpnProfilePackageURLSender sends the GetVpnProfilePackageURL request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLSender(req *http.Request) (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -670,7 +670,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLSender(req *ht
 
 // GetVpnProfilePackageURLResponder handles the response to the GetVpnProfilePackageURL request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -684,31 +684,31 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLResponder(resp
 // List gets all virtual network gateways by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -729,14 +729,14 @@ func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -748,10 +748,10 @@ func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -759,17 +759,17 @@ func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -778,31 +778,31 @@ func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
 	result.fn = client.listConnectionsNextResults
 	req, err := client.ListConnectionsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.vnglcr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglcr, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListConnectionsPreparer prepares the ListConnections request.
-func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -824,14 +824,14 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.C
 
 // ListConnectionsSender sends the ListConnections request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListConnectionsResponder handles the response to the ListConnections request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -843,10 +843,10 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.R
 }
 
 // listConnectionsNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListConnectionsResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -854,17 +854,17 @@ func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResult
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListConnectionsComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
 	result.page, err = client.ListConnections(ctx, resourceGroupName, virtualNetworkGatewayName)
 	return
 }
@@ -874,16 +874,16 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.C
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. gatewayVip is virtual network gateway vip address supplied to the begin reset of the
 // active-active feature enabled gateway.
-func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysGroupResetFuture, err error) {
 	req, err := client.ResetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, gatewayVip)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -891,7 +891,7 @@ func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGr
 }
 
 // ResetPreparer prepares the Reset request.
-func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -916,7 +916,7 @@ func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, re
 
 // ResetSender sends the Reset request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysGroupResetFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -931,7 +931,7 @@ func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (futur
 
 // ResetResponder handles the response to the Reset request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-08-01/network/virtualnetworkpeerings.go b/services/network/mgmt/2017-08-01/network/virtualnetworkpeeringsgroup.go
similarity index 70%
rename from services/network/mgmt/2017-08-01/network/virtualnetworkpeerings.go
rename to services/network/mgmt/2017-08-01/network/virtualnetworkpeeringsgroup.go
index 6ee976c0d0c2..8f523031f962 100644
--- a/services/network/mgmt/2017-08-01/network/virtualnetworkpeerings.go
+++ b/services/network/mgmt/2017-08-01/network/virtualnetworkpeeringsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkPeeringsClient is the network Client
-type VirtualNetworkPeeringsClient struct {
+// VirtualNetworkPeeringsGroupClient is the network Client
+type VirtualNetworkPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkPeeringsClient creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
-	return NewVirtualNetworkPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkPeeringsGroupClient creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClient(subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return NewVirtualNetworkPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkPeeringsClientWithBaseURI creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
-	return VirtualNetworkPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkPeeringsGroupClientWithBaseURI creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return VirtualNetworkPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified virtual network.
@@ -44,16 +44,16 @@ func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID s
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the peering. virtualNetworkPeeringParameters is parameters supplied to
 // the create or update virtual network peering operation.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -86,7 +86,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -156,7 +156,7 @@ func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -231,14 +231,14 @@ func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +252,31 @@ func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (re
 // List gets all virtual network peerings in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworkPeeringsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
+func (client VirtualNetworkPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -298,14 +298,14 @@ func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +317,10 @@ func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
 	req, err := lastResults.virtualNetworkPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +328,17 @@ func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/virtualnetworks.go b/services/network/mgmt/2017-08-01/network/virtualnetworksgroup.go
similarity index 70%
rename from services/network/mgmt/2017-08-01/network/virtualnetworks.go
rename to services/network/mgmt/2017-08-01/network/virtualnetworksgroup.go
index 7c006268ae59..5ebb12d7fd0e 100644
--- a/services/network/mgmt/2017-08-01/network/virtualnetworks.go
+++ b/services/network/mgmt/2017-08-01/network/virtualnetworksgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// VirtualNetworksClient is the network Client
-type VirtualNetworksClient struct {
+// VirtualNetworksGroupClient is the network Client
+type VirtualNetworksGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworksClient creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return NewVirtualNetworksClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworksGroupClient creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClient(subscriptionID string) VirtualNetworksGroupClient {
+	return NewVirtualNetworksGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworksClientWithBaseURI creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return VirtualNetworksClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworksGroupClientWithBaseURI creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksGroupClient {
+	return VirtualNetworksGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckIPAddressAvailability checks whether a private IP address is available for use.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // IPAddress is the private IP address to be verified.
-func (client VirtualNetworksClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
 	req, err := client.CheckIPAddressAvailabilityPreparer(ctx, resourceGroupName, virtualNetworkName, IPAddress)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CheckIPAddressAvailabilitySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CheckIPAddressAvailabilityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CheckIPAddressAvailabilityPreparer prepares the CheckIPAddressAvailability request.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -91,14 +91,14 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx conte
 
 // CheckIPAddressAvailabilitySender sends the CheckIPAddressAvailability request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CheckIPAddressAvailabilityResponder handles the response to the CheckIPAddressAvailability request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // parameters is parameters supplied to the create or update virtual network operation
-func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -154,7 +154,7 @@ func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -169,7 +169,7 @@ func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -183,16 +183,16 @@ func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response)
 // Delete deletes the specified virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -200,7 +200,7 @@ func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -222,7 +222,7 @@ func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) DeleteSender(req *http.Request) (future VirtualNetworksGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -237,7 +237,7 @@ func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future Virt
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworksGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,30 +251,30 @@ func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // expand is expands referenced resources.
-func (client VirtualNetworksClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -299,14 +299,14 @@ func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,31 +320,31 @@ func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result Vi
 // List gets all virtual networks in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworksClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -365,14 +365,14 @@ func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -384,10 +384,10 @@ func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result V
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -395,47 +395,47 @@ func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all virtual networks in a subscription.
-func (client VirtualNetworksClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -455,14 +455,14 @@ func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -474,10 +474,10 @@ func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (resul
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -485,17 +485,17 @@ func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetwor
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -503,31 +503,31 @@ func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result
 // ListUsage lists usage stats.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
 	result.fn = client.listUsageNextResults
 	req, err := client.ListUsagePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.vnlur.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlur, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListUsagePreparer prepares the ListUsage request.
-func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -549,14 +549,14 @@ func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resou
 
 // ListUsageSender sends the ListUsage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListUsageSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListUsageSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListUsageResponder handles the response to the ListUsage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -568,10 +568,10 @@ func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (res
 }
 
 // listUsageNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
 	req, err := lastResults.virtualNetworkListUsageResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -579,17 +579,17 @@ func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetw
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListUsageComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
 	result.page, err = client.ListUsage(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-08-01/network/watchers.go b/services/network/mgmt/2017-08-01/network/watchersgroup.go
similarity index 71%
rename from services/network/mgmt/2017-08-01/network/watchers.go
rename to services/network/mgmt/2017-08-01/network/watchersgroup.go
index c74729e3ebb7..141dce15d034 100644
--- a/services/network/mgmt/2017-08-01/network/watchers.go
+++ b/services/network/mgmt/2017-08-01/network/watchersgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// WatchersClient is the network Client
-type WatchersClient struct {
+// WatchersGroupClient is the network Client
+type WatchersGroupClient struct {
 	BaseClient
 }
 
-// NewWatchersClient creates an instance of the WatchersClient client.
-func NewWatchersClient(subscriptionID string) WatchersClient {
-	return NewWatchersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewWatchersGroupClient creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClient(subscriptionID string) WatchersGroupClient {
+	return NewWatchersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewWatchersClientWithBaseURI creates an instance of the WatchersClient client.
-func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) WatchersClient {
-	return WatchersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewWatchersGroupClientWithBaseURI creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClientWithBaseURI(baseURI string, subscriptionID string) WatchersGroupClient {
+	return WatchersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckConnectivity verifies the possibility of establishing a direct TCP connection from a virtual machine to a given
@@ -45,24 +45,24 @@ func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) Watcher
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that determine how the connectivity check will be performed.
-func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersGroupCheckConnectivityFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.Source.ResourceID", Name: validation.Null, Rule: true, Chain: nil}}},
 				{Target: "parameters.Destination", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "CheckConnectivity", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "CheckConnectivity", err.Error())
 	}
 
 	req, err := client.CheckConnectivityPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CheckConnectivitySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -70,7 +70,7 @@ func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGrou
 }
 
 // CheckConnectivityPreparer prepares the CheckConnectivity request.
-func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
+func (client WatchersGroupClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -94,7 +94,7 @@ func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, reso
 
 // CheckConnectivitySender sends the CheckConnectivity request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivitySender(req *http.Request) (future WatchersGroupCheckConnectivityFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -109,7 +109,7 @@ func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future
 
 // CheckConnectivityResponder handles the response to the CheckConnectivity request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
+func (client WatchersGroupClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -124,30 +124,30 @@ func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the network watcher resource.
-func (client WatchersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CreateOrUpdateSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
+func (client WatchersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -171,14 +171,14 @@ func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourc
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -192,16 +192,16 @@ func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (resul
 // Delete deletes the specified network watcher resource.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -209,7 +209,7 @@ func (client WatchersClient) Delete(ctx context.Context, resourceGroupName strin
 }
 
 // DeletePreparer prepares the Delete request.
-func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -231,7 +231,7 @@ func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupNa
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) DeleteSender(req *http.Request) (future WatchersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -246,7 +246,7 @@ func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDel
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client WatchersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -259,30 +259,30 @@ func (client WatchersClient) DeleteResponder(resp *http.Response) (result autore
 // Get gets the specified network watcher by resource group.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
+func (client WatchersGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -304,14 +304,14 @@ func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) GetResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -326,22 +326,22 @@ func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher,
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define a resource to query flow log status.
-func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGroupGetFlowLogStatusFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetFlowLogStatus", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetFlowLogStatus", err.Error())
 	}
 
 	req, err := client.GetFlowLogStatusPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetFlowLogStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -349,7 +349,7 @@ func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroup
 }
 
 // GetFlowLogStatusPreparer prepares the GetFlowLogStatus request.
-func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -373,7 +373,7 @@ func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resou
 
 // GetFlowLogStatusSender sends the GetFlowLogStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGroupGetFlowLogStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -388,7 +388,7 @@ func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future W
 
 // GetFlowLogStatusResponder handles the response to the GetFlowLogStatus request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -403,24 +403,24 @@ func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the source and destination endpoint.
-func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGroupGetNextHopFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.SourceIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.DestinationIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetNextHop", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetNextHop", err.Error())
 	}
 
 	req, err := client.GetNextHopPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetNextHopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -428,7 +428,7 @@ func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName s
 }
 
 // GetNextHopPreparer prepares the GetNextHop request.
-func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -452,7 +452,7 @@ func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGro
 
 // GetNextHopSender sends the GetNextHop request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetNextHopSender(req *http.Request) (future WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHopSender(req *http.Request) (future WatchersGroupGetNextHopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -467,7 +467,7 @@ func (client WatchersClient) GetNextHopSender(req *http.Request) (future Watcher
 
 // GetNextHopResponder handles the response to the GetNextHop request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
+func (client WatchersGroupClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -482,36 +482,36 @@ func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result Ne
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the representation of topology.
-func (client WatchersClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceGroupName", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTopology", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTopology", err.Error())
 	}
 
 	req, err := client.GetTopologyPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetTopologySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetTopologyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetTopologyPreparer prepares the GetTopology request.
-func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -535,14 +535,14 @@ func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGr
 
 // GetTopologySender sends the GetTopology request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTopologySender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetTopologySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetTopologyResponder handles the response to the GetTopology request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -557,7 +557,7 @@ func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result T
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to troubleshoot.
-func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGroupGetTroubleshootingFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -565,18 +565,18 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 					Chain: []validation.Constraint{{Target: "parameters.TroubleshootingProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.TroubleshootingProperties.StoragePath", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshooting", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshooting", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -584,7 +584,7 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 }
 
 // GetTroubleshootingPreparer prepares the GetTroubleshooting request.
-func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -608,7 +608,7 @@ func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, res
 
 // GetTroubleshootingSender sends the GetTroubleshooting request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingSender(req *http.Request) (future WatchersGroupGetTroubleshootingFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -623,7 +623,7 @@ func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future
 
 // GetTroubleshootingResponder handles the response to the GetTroubleshooting request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -638,22 +638,22 @@ func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to query the troubleshooting result.
-func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGroupGetTroubleshootingResultFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshootingResult", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshootingResult", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingResultPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingResultSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -661,7 +661,7 @@ func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resou
 }
 
 // GetTroubleshootingResultPreparer prepares the GetTroubleshootingResult request.
-func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -685,7 +685,7 @@ func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Contex
 
 // GetTroubleshootingResultSender sends the GetTroubleshootingResult request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGroupGetTroubleshootingResultFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -700,7 +700,7 @@ func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (
 
 // GetTroubleshootingResultResponder handles the response to the GetTroubleshootingResult request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -715,22 +715,22 @@ func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the VM to check security groups for.
-func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGroupGetVMSecurityRulesFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetVMSecurityRules", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetVMSecurityRules", err.Error())
 	}
 
 	req, err := client.GetVMSecurityRulesPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVMSecurityRulesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -738,7 +738,7 @@ func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGro
 }
 
 // GetVMSecurityRulesPreparer prepares the GetVMSecurityRules request.
-func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -762,7 +762,7 @@ func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, res
 
 // GetVMSecurityRulesSender sends the GetVMSecurityRules request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGroupGetVMSecurityRulesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -777,7 +777,7 @@ func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future
 
 // GetVMSecurityRulesResponder handles the response to the GetVMSecurityRules request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -791,30 +791,30 @@ func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (r
 // List gets all network watchers by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client WatchersClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client WatchersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -835,14 +835,14 @@ func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -854,30 +854,30 @@ func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherL
 }
 
 // ListAll gets all network watchers by subscription.
-func (client WatchersClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client WatchersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -897,14 +897,14 @@ func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -919,7 +919,7 @@ func (client WatchersClient) ListAllResponder(resp *http.Response) (result Watch
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define the configuration of flow log.
-func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -927,18 +927,18 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 					Chain: []validation.Constraint{{Target: "parameters.FlowLogProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.FlowLogProperties.Enabled", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "SetFlowLogConfiguration", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "SetFlowLogConfiguration", err.Error())
 	}
 
 	req, err := client.SetFlowLogConfigurationPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetFlowLogConfigurationSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -946,7 +946,7 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 }
 
 // SetFlowLogConfigurationPreparer prepares the SetFlowLogConfiguration request.
-func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -970,7 +970,7 @@ func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context
 
 // SetFlowLogConfigurationSender sends the SetFlowLogConfiguration request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -985,7 +985,7 @@ func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (f
 
 // SetFlowLogConfigurationResponder handles the response to the SetFlowLogConfiguration request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1000,7 +1000,7 @@ func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Respons
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the IP flow to be verified.
-func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersGroupVerifyIPFlowFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -1008,18 +1008,18 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 				{Target: "parameters.RemotePort", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.LocalIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.RemoteIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "VerifyIPFlow", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "VerifyIPFlow", err.Error())
 	}
 
 	req, err := client.VerifyIPFlowPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.VerifyIPFlowSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1027,7 +1027,7 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 }
 
 // VerifyIPFlowPreparer prepares the VerifyIPFlow request.
-func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
+func (client WatchersGroupClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1051,7 +1051,7 @@ func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceG
 
 // VerifyIPFlowSender sends the VerifyIPFlow request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlowSender(req *http.Request) (future WatchersGroupVerifyIPFlowFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1066,7 +1066,7 @@ func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future Watch
 
 // VerifyIPFlowResponder handles the response to the VerifyIPFlow request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
+func (client WatchersGroupClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/applicationgateways.go b/services/network/mgmt/2017-09-01/network/applicationgatewaysgroup.go
similarity index 71%
rename from services/network/mgmt/2017-09-01/network/applicationgateways.go
rename to services/network/mgmt/2017-09-01/network/applicationgatewaysgroup.go
index a05b0b04af81..64c6116df292 100644
--- a/services/network/mgmt/2017-09-01/network/applicationgateways.go
+++ b/services/network/mgmt/2017-09-01/network/applicationgatewaysgroup.go
@@ -25,35 +25,35 @@ import (
 	"net/http"
 )
 
-// ApplicationGatewaysClient is the network Client
-type ApplicationGatewaysClient struct {
+// ApplicationGatewaysGroupClient is the network Client
+type ApplicationGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewApplicationGatewaysClient creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
-	return NewApplicationGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewApplicationGatewaysGroupClient creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClient(subscriptionID string) ApplicationGatewaysGroupClient {
+	return NewApplicationGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewApplicationGatewaysClientWithBaseURI creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
-	return ApplicationGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewApplicationGatewaysGroupClientWithBaseURI creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysGroupClient {
+	return ApplicationGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // BackendHealth gets the backend health of the specified application gateway in a resource group.
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. expand is expands BackendAddressPool and BackendHttpSettings referenced in backend health.
-func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	req, err := client.BackendHealthPreparer(ctx, resourceGroupName, applicationGatewayName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.BackendHealthSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resou
 }
 
 // BackendHealthPreparer prepares the BackendHealth request.
-func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Contex
 
 // BackendHealthSender sends the BackendHealth request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (
 
 // BackendHealthResponder handles the response to the BackendHealth request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,7 +116,7 @@ func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. parameters is parameters supplied to the create or update application gateway operation.
-func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ApplicationGatewayPropertiesFormat", Name: validation.Null, Rule: false,
@@ -126,18 +126,18 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 						{Target: "parameters.ApplicationGatewayPropertiesFormat.WebApplicationFirewallConfiguration.RuleSetVersion", Name: validation.Null, Rule: true, Chain: nil},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ApplicationGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ApplicationGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -145,7 +145,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -169,7 +169,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +184,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -199,16 +199,16 @@ func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -216,7 +216,7 @@ func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGrou
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -238,7 +238,7 @@ func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, reso
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteSender(req *http.Request) (future ApplicationGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -253,7 +253,7 @@ func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -267,30 +267,30 @@ func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -312,14 +312,14 @@ func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourc
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (resul
 // GetSslPredefinedPolicy gets Ssl predefined policy with the specified policy name.
 //
 // predefinedPolicyName is name of Ssl predefined policy.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	req, err := client.GetSslPredefinedPolicyPreparer(ctx, predefinedPolicyName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSslPredefinedPolicySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSslPredefinedPolicyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSslPredefinedPolicyPreparer prepares the GetSslPredefinedPolicy request.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"predefinedPolicyName": autorest.Encode("path", predefinedPolicyName),
 		"subscriptionId":       autorest.Encode("path", client.SubscriptionID),
@@ -377,14 +377,14 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx conte
 
 // GetSslPredefinedPolicySender sends the GetSslPredefinedPolicy request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSslPredefinedPolicyResponder handles the response to the GetSslPredefinedPolicy request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -398,31 +398,31 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *ht
 // List lists all application gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ApplicationGatewaysClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -443,14 +443,14 @@ func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resour
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -462,10 +462,10 @@ func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (resu
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -473,47 +473,47 @@ func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationG
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the application gateways in a subscription.
-func (client ApplicationGatewaysClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -533,14 +533,14 @@ func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*h
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -552,10 +552,10 @@ func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (r
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -563,46 +563,46 @@ func (client ApplicationGatewaysClient) listAllNextResults(lastResults Applicati
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
 
 // ListAvailableSslOptions lists available Ssl options for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
 	req, err := client.ListAvailableSslOptionsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslOptionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableSslOptionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslOptionsPreparer prepares the ListAvailableSslOptions request.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -622,14 +622,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx cont
 
 // ListAvailableSslOptionsSender sends the ListAvailableSslOptions request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslOptionsResponder handles the response to the ListAvailableSslOptions request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -641,31 +641,31 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *h
 }
 
 // ListAvailableSslPredefinedPolicies lists all SSL predefined policies for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
 	result.fn = client.listAvailableSslPredefinedPoliciesNextResults
 	req, err := client.ListAvailableSslPredefinedPoliciesPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.agaspp.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
 		return
 	}
 
 	result.agaspp, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesPreparer prepares the ListAvailableSslPredefinedPolicies request.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -685,14 +685,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPrepar
 
 // ListAvailableSslPredefinedPoliciesSender sends the ListAvailableSslPredefinedPolicies request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslPredefinedPoliciesResponder handles the response to the ListAvailableSslPredefinedPolicies request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -704,10 +704,10 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesRespon
 }
 
 // listAvailableSslPredefinedPoliciesNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	req, err := lastResults.applicationGatewayAvailableSslPredefinedPoliciesPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -715,46 +715,46 @@ func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextRe
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
 	result.page, err = client.ListAvailableSslPredefinedPolicies(ctx)
 	return
 }
 
 // ListAvailableWafRuleSets lists all available web application firewall rule sets.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	req, err := client.ListAvailableWafRuleSetsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableWafRuleSetsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableWafRuleSetsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableWafRuleSetsPreparer prepares the ListAvailableWafRuleSets request.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -774,14 +774,14 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx con
 
 // ListAvailableWafRuleSetsSender sends the ListAvailableWafRuleSets request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableWafRuleSetsResponder handles the response to the ListAvailableWafRuleSets request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -796,16 +796,16 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStartFuture, err error) {
 	req, err := client.StartPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StartSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -813,7 +813,7 @@ func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroup
 }
 
 // StartPreparer prepares the Start request.
-func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -835,7 +835,7 @@ func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resou
 
 // StartSender sends the Start request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StartSender(req *http.Request) (future ApplicationGatewaysGroupStartFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -850,7 +850,7 @@ func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future A
 
 // StartResponder handles the response to the Start request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -864,16 +864,16 @@ func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -881,7 +881,7 @@ func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupN
 }
 
 // StopPreparer prepares the Stop request.
-func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -903,7 +903,7 @@ func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resour
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StopSender(req *http.Request) (future ApplicationGatewaysGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -918,7 +918,7 @@ func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future Ap
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -932,16 +932,16 @@ func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. parameters is parameters supplied to update application gateway tags.
-func (client ApplicationGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (result ApplicationGatewaysUpdateTagsFuture, err error) {
+func (client ApplicationGatewaysGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (result ApplicationGatewaysGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, applicationGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -949,7 +949,7 @@ func (client ApplicationGatewaysClient) UpdateTags(ctx context.Context, resource
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client ApplicationGatewaysClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -973,7 +973,7 @@ func (client ApplicationGatewaysClient) UpdateTagsPreparer(ctx context.Context,
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) UpdateTagsSender(req *http.Request) (future ApplicationGatewaysUpdateTagsFuture, err error) {
+func (client ApplicationGatewaysGroupClient) UpdateTagsSender(req *http.Request) (future ApplicationGatewaysGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -988,7 +988,7 @@ func (client ApplicationGatewaysClient) UpdateTagsSender(req *http.Request) (fut
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) UpdateTagsResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) UpdateTagsResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go b/services/network/mgmt/2017-09-01/network/applicationsecuritygroupsgroup.go
similarity index 68%
rename from services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go
rename to services/network/mgmt/2017-09-01/network/applicationsecuritygroupsgroup.go
index 62e14d1e358e..aa233b0b82db 100644
--- a/services/network/mgmt/2017-09-01/network/applicationsecuritygroups.go
+++ b/services/network/mgmt/2017-09-01/network/applicationsecuritygroupsgroup.go
@@ -24,35 +24,36 @@ import (
 	"net/http"
 )
 
-// ApplicationSecurityGroupsClient is the network Client
-type ApplicationSecurityGroupsClient struct {
+// ApplicationSecurityGroupsGroupClient is the network Client
+type ApplicationSecurityGroupsGroupClient struct {
 	BaseClient
 }
 
-// NewApplicationSecurityGroupsClient creates an instance of the ApplicationSecurityGroupsClient client.
-func NewApplicationSecurityGroupsClient(subscriptionID string) ApplicationSecurityGroupsClient {
-	return NewApplicationSecurityGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewApplicationSecurityGroupsGroupClient creates an instance of the ApplicationSecurityGroupsGroupClient client.
+func NewApplicationSecurityGroupsGroupClient(subscriptionID string) ApplicationSecurityGroupsGroupClient {
+	return NewApplicationSecurityGroupsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewApplicationSecurityGroupsClientWithBaseURI creates an instance of the ApplicationSecurityGroupsClient client.
-func NewApplicationSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsClient {
-	return ApplicationSecurityGroupsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewApplicationSecurityGroupsGroupClientWithBaseURI creates an instance of the ApplicationSecurityGroupsGroupClient
+// client.
+func NewApplicationSecurityGroupsGroupClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsGroupClient {
+	return ApplicationSecurityGroupsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an application security group.
 //
 // resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application
 // security group. parameters is parameters supplied to the create or update ApplicationSecurityGroup operation.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (result ApplicationSecurityGroupsCreateOrUpdateFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (result ApplicationSecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +61,7 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdate(ctx context.Context
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationSecurityGroupName": autorest.Encode("path", applicationSecurityGroupName),
 		"resourceGroupName":            autorest.Encode("path", resourceGroupName),
@@ -84,7 +85,7 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdatePreparer(ctx context
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future ApplicationSecurityGroupsCreateOrUpdateFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdateSender(req *http.Request) (future ApplicationSecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +100,7 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdateSender(req *http.Req
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -114,16 +115,16 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdateResponder(resp *http
 //
 // resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application
 // security group.
-func (client ApplicationSecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroupsDeleteFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) Delete(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroupsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, applicationSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -131,7 +132,7 @@ func (client ApplicationSecurityGroupsClient) Delete(ctx context.Context, resour
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ApplicationSecurityGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationSecurityGroupName": autorest.Encode("path", applicationSecurityGroupName),
 		"resourceGroupName":            autorest.Encode("path", resourceGroupName),
@@ -153,7 +154,7 @@ func (client ApplicationSecurityGroupsClient) DeletePreparer(ctx context.Context
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) DeleteSender(req *http.Request) (future ApplicationSecurityGroupsDeleteFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) DeleteSender(req *http.Request) (future ApplicationSecurityGroupsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -168,7 +169,7 @@ func (client ApplicationSecurityGroupsClient) DeleteSender(req *http.Request) (f
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationSecurityGroupsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -182,30 +183,30 @@ func (client ApplicationSecurityGroupsClient) DeleteResponder(resp *http.Respons
 //
 // resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application
 // security group.
-func (client ApplicationSecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroup, err error) {
+func (client ApplicationSecurityGroupsGroupClient) Get(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroup, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, applicationSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ApplicationSecurityGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationSecurityGroupName": autorest.Encode("path", applicationSecurityGroupName),
 		"resourceGroupName":            autorest.Encode("path", resourceGroupName),
@@ -227,14 +228,14 @@ func (client ApplicationSecurityGroupsClient) GetPreparer(ctx context.Context, r
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationSecurityGroupsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) GetResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
+func (client ApplicationSecurityGroupsGroupClient) GetResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -248,31 +249,31 @@ func (client ApplicationSecurityGroupsClient) GetResponder(resp *http.Response)
 // List gets all the application security groups in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ApplicationSecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultPage, err error) {
+func (client ApplicationSecurityGroupsGroupClient) List(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.asglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.asglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ApplicationSecurityGroupsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -293,14 +294,14 @@ func (client ApplicationSecurityGroupsClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) ListResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -312,10 +313,10 @@ func (client ApplicationSecurityGroupsClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ApplicationSecurityGroupsClient) listNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) listNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
 	req, err := lastResults.applicationSecurityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -323,47 +324,47 @@ func (client ApplicationSecurityGroupsClient) listNextResults(lastResults Applic
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationSecurityGroupsClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultIterator, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all application security groups in a subscription.
-func (client ApplicationSecurityGroupsClient) ListAll(ctx context.Context) (result ApplicationSecurityGroupListResultPage, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAll(ctx context.Context) (result ApplicationSecurityGroupListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.asglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.asglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ApplicationSecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -383,14 +384,14 @@ func (client ApplicationSecurityGroupsClient) ListAllPreparer(ctx context.Contex
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) ListAllResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -402,10 +403,10 @@ func (client ApplicationSecurityGroupsClient) ListAllResponder(resp *http.Respon
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ApplicationSecurityGroupsClient) listAllNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) listAllNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
 	req, err := lastResults.applicationSecurityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -413,17 +414,17 @@ func (client ApplicationSecurityGroupsClient) listAllNextResults(lastResults App
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationSecurityGroupsClient) ListAllComplete(ctx context.Context) (result ApplicationSecurityGroupListResultIterator, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllComplete(ctx context.Context) (result ApplicationSecurityGroupListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/availableendpointservices.go b/services/network/mgmt/2017-09-01/network/availableendpointservicesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-09-01/network/availableendpointservices.go
rename to services/network/mgmt/2017-09-01/network/availableendpointservicesgroup.go
index a7cf1080cf5a..4e55f9bb96d6 100644
--- a/services/network/mgmt/2017-09-01/network/availableendpointservices.go
+++ b/services/network/mgmt/2017-09-01/network/availableendpointservicesgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// AvailableEndpointServicesClient is the network Client
-type AvailableEndpointServicesClient struct {
+// AvailableEndpointServicesGroupClient is the network Client
+type AvailableEndpointServicesGroupClient struct {
 	BaseClient
 }
 
-// NewAvailableEndpointServicesClient creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClient(subscriptionID string) AvailableEndpointServicesClient {
-	return NewAvailableEndpointServicesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewAvailableEndpointServicesGroupClient creates an instance of the AvailableEndpointServicesGroupClient client.
+func NewAvailableEndpointServicesGroupClient(subscriptionID string) AvailableEndpointServicesGroupClient {
+	return NewAvailableEndpointServicesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewAvailableEndpointServicesClientWithBaseURI creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesClient {
-	return AvailableEndpointServicesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewAvailableEndpointServicesGroupClientWithBaseURI creates an instance of the AvailableEndpointServicesGroupClient
+// client.
+func NewAvailableEndpointServicesGroupClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesGroupClient {
+	return AvailableEndpointServicesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list what values of endpoint services are available for use.
 //
 // location is the location to check available endpoint services.
-func (client AvailableEndpointServicesClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
+func (client AvailableEndpointServicesGroupClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.eslr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.eslr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client AvailableEndpointServicesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -87,14 +88,14 @@ func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client AvailableEndpointServicesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client AvailableEndpointServicesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -106,10 +107,10 @@ func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client AvailableEndpointServicesClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
 	req, err := lastResults.endpointServicesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -117,17 +118,17 @@ func (client AvailableEndpointServicesClient) listNextResults(lastResults Endpoi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client AvailableEndpointServicesClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
+func (client AvailableEndpointServicesGroupClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/bgpservicecommunities.go b/services/network/mgmt/2017-09-01/network/bgpservicecommunitiesgroup.go
similarity index 63%
rename from services/network/mgmt/2017-09-01/network/bgpservicecommunities.go
rename to services/network/mgmt/2017-09-01/network/bgpservicecommunitiesgroup.go
index d05553742ab6..3106e37ea530 100644
--- a/services/network/mgmt/2017-09-01/network/bgpservicecommunities.go
+++ b/services/network/mgmt/2017-09-01/network/bgpservicecommunitiesgroup.go
@@ -24,47 +24,47 @@ import (
 	"net/http"
 )
 
-// BgpServiceCommunitiesClient is the network Client
-type BgpServiceCommunitiesClient struct {
+// BgpServiceCommunitiesGroupClient is the network Client
+type BgpServiceCommunitiesGroupClient struct {
 	BaseClient
 }
 
-// NewBgpServiceCommunitiesClient creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
-	return NewBgpServiceCommunitiesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewBgpServiceCommunitiesGroupClient creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClient(subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return NewBgpServiceCommunitiesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewBgpServiceCommunitiesClientWithBaseURI creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
-	return BgpServiceCommunitiesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewBgpServiceCommunitiesGroupClientWithBaseURI creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return BgpServiceCommunitiesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available bgp service communities.
-func (client BgpServiceCommunitiesClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
+func (client BgpServiceCommunitiesGroupClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.bsclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.bsclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client BgpServiceCommunitiesGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -84,14 +84,14 @@ func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*ht
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client BgpServiceCommunitiesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client BgpServiceCommunitiesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -103,10 +103,10 @@ func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
 	req, err := lastResults.bgpServiceCommunityListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -114,17 +114,17 @@ func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpService
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client BgpServiceCommunitiesClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/client.go b/services/network/mgmt/2017-09-01/network/client.go
index 3c5bc3888085..c94ce1ee38a6 100644
--- a/services/network/mgmt/2017-09-01/network/client.go
+++ b/services/network/mgmt/2017-09-01/network/client.go
@@ -21,10 +21,7 @@ package network
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 
 import (
-	"context"
 	"github.com/Azure/go-autorest/autorest"
-	"github.com/Azure/go-autorest/autorest/azure"
-	"net/http"
 )
 
 const (
@@ -52,70 +49,3 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
 		SubscriptionID: subscriptionID,
 	}
 }
-
-// CheckDNSNameAvailability checks whether a domain name in the cloudapp.azure.com zone is available for use.
-//
-// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
-// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
-func (client BaseClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
-	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
-		return
-	}
-
-	resp, err := client.CheckDNSNameAvailabilitySender(req)
-	if err != nil {
-		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure sending request")
-		return
-	}
-
-	result, err = client.CheckDNSNameAvailabilityResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
-	}
-
-	return
-}
-
-// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
-func (client BaseClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
-	pathParameters := map[string]interface{}{
-		"location":       autorest.Encode("path", location),
-		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
-	}
-
-	const APIVersion = "2017-09-01"
-	queryParameters := map[string]interface{}{
-		"api-version":     APIVersion,
-		"domainNameLabel": autorest.Encode("query", domainNameLabel),
-	}
-
-	preparer := autorest.CreatePreparer(
-		autorest.AsGet(),
-		autorest.WithBaseURL(client.BaseURI),
-		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
-		autorest.WithQueryParameters(queryParameters))
-	return preparer.Prepare((&http.Request{}).WithContext(ctx))
-}
-
-// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
-// http.Response Body if it receives an error.
-func (client BaseClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
-	return autorest.SendWithSender(client, req,
-		azure.DoRetryWithRegistration(client.Client))
-}
-
-// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
-// closes the http.Response Body.
-func (client BaseClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
-	err = autorest.Respond(
-		resp,
-		client.ByInspecting(),
-		azure.WithErrorUnlessStatusCode(http.StatusOK),
-		autorest.ByUnmarshallingJSON(&result),
-		autorest.ByClosing())
-	result.Response = autorest.Response{Response: resp}
-	return
-}
diff --git a/services/network/mgmt/2017-09-01/network/defaultsecurityrules.go b/services/network/mgmt/2017-09-01/network/defaultsecurityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-09-01/network/defaultsecurityrules.go
rename to services/network/mgmt/2017-09-01/network/defaultsecurityrulesgroup.go
index 94666cae9888..dcc5fcad3fb7 100644
--- a/services/network/mgmt/2017-09-01/network/defaultsecurityrules.go
+++ b/services/network/mgmt/2017-09-01/network/defaultsecurityrulesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// DefaultSecurityRulesClient is the network Client
-type DefaultSecurityRulesClient struct {
+// DefaultSecurityRulesGroupClient is the network Client
+type DefaultSecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewDefaultSecurityRulesClient creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClient(subscriptionID string) DefaultSecurityRulesClient {
-	return NewDefaultSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewDefaultSecurityRulesGroupClient creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClient(subscriptionID string) DefaultSecurityRulesGroupClient {
+	return NewDefaultSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewDefaultSecurityRulesClientWithBaseURI creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesClient {
-	return DefaultSecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewDefaultSecurityRulesGroupClientWithBaseURI creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesGroupClient {
+	return DefaultSecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get get the specified default network security rule.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. defaultSecurityRuleName is the name of the default security rule.
-func (client DefaultSecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"defaultSecurityRuleName":  autorest.Encode("path", defaultSecurityRuleName),
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
@@ -89,14 +89,14 @@ func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +111,31 @@ func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client DefaultSecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client DefaultSecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -157,14 +157,14 @@ func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +176,10 @@ func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +187,17 @@ func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client DefaultSecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client DefaultSecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go b/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizationsgroup.go
similarity index 67%
rename from services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go
rename to services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizationsgroup.go
index 72d1bf6e5845..1047069e2a57 100644
--- a/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizations.go
+++ b/services/network/mgmt/2017-09-01/network/expressroutecircuitauthorizationsgroup.go
@@ -24,21 +24,21 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitAuthorizationsClient is the network Client
-type ExpressRouteCircuitAuthorizationsClient struct {
+// ExpressRouteCircuitAuthorizationsGroupClient is the network Client
+type ExpressRouteCircuitAuthorizationsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitAuthorizationsClient creates an instance of the ExpressRouteCircuitAuthorizationsClient
-// client.
-func NewExpressRouteCircuitAuthorizationsClient(subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return NewExpressRouteCircuitAuthorizationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitAuthorizationsGroupClient creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClient(subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitAuthorizationsClientWithBaseURI creates an instance of the
-// ExpressRouteCircuitAuthorizationsClient client.
-func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return ExpressRouteCircuitAuthorizationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return ExpressRouteCircuitAuthorizationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an authorization in the specified express route circuit.
@@ -46,16 +46,16 @@ func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subsc
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization. authorizationParameters is parameters supplied to the create
 // or update express route circuit authorization operation.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, authorizationName, authorizationParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -63,7 +63,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -88,7 +88,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -103,7 +103,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -118,16 +118,16 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(re
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -135,7 +135,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -158,7 +158,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -173,7 +173,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Req
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -187,30 +187,30 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -233,14 +233,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Co
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -254,31 +254,31 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Re
 // List gets all authorizations in an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit.
-func (client ExpressRouteCircuitAuthorizationsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.alr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.alr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -300,14 +300,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.C
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -319,10 +319,10 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.R
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
 	req, err := lastResults.authorizationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -330,17 +330,17 @@ func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitAuthorizationsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go b/services/network/mgmt/2017-09-01/network/expressroutecircuitpeeringsgroup.go
similarity index 68%
rename from services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go
rename to services/network/mgmt/2017-09-01/network/expressroutecircuitpeeringsgroup.go
index 43415eb652fa..14885c9764cd 100644
--- a/services/network/mgmt/2017-09-01/network/expressroutecircuitpeerings.go
+++ b/services/network/mgmt/2017-09-01/network/expressroutecircuitpeeringsgroup.go
@@ -24,19 +24,20 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitPeeringsClient is the network Client
-type ExpressRouteCircuitPeeringsClient struct {
+// ExpressRouteCircuitPeeringsGroupClient is the network Client
+type ExpressRouteCircuitPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitPeeringsClient creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return NewExpressRouteCircuitPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitPeeringsGroupClient creates an instance of the ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClient(subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitPeeringsClientWithBaseURI creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return ExpressRouteCircuitPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitPeeringsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return ExpressRouteCircuitPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified express route circuits.
@@ -44,16 +45,16 @@ func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptio
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. peeringParameters is parameters supplied to the create or update express
 // route circuit peering operation.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, peeringName, peeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +62,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Conte
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -86,7 +87,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +102,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.R
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +117,16 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +134,7 @@ func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, reso
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -156,7 +157,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Conte
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +172,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request)
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +186,30 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -231,14 +232,14 @@ func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context,
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +253,31 @@ func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response
 // List gets all peerings in a specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitPeeringsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ercplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ercplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -298,14 +299,14 @@ func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +318,10 @@ func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Respons
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
 	req, err := lastResults.expressRouteCircuitPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +329,17 @@ func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults Expr
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/expressroutecircuits.go b/services/network/mgmt/2017-09-01/network/expressroutecircuitsgroup.go
similarity index 72%
rename from services/network/mgmt/2017-09-01/network/expressroutecircuits.go
rename to services/network/mgmt/2017-09-01/network/expressroutecircuitsgroup.go
index 5893b64e9e1d..855a1212af68 100644
--- a/services/network/mgmt/2017-09-01/network/expressroutecircuits.go
+++ b/services/network/mgmt/2017-09-01/network/expressroutecircuitsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitsClient is the network Client
-type ExpressRouteCircuitsClient struct {
+// ExpressRouteCircuitsGroupClient is the network Client
+type ExpressRouteCircuitsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitsClient creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
-	return NewExpressRouteCircuitsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitsGroupClient creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClient(subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return NewExpressRouteCircuitsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitsClientWithBaseURI creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
-	return ExpressRouteCircuitsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitsGroupClientWithBaseURI creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return ExpressRouteCircuitsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is
 // parameters supplied to the create or update express route circuit operation.
-func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Resp
 // Delete deletes the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -180,30 +180,30 @@ func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (r
 // Get gets information about the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of express route circuit.
-func (client ExpressRouteCircuitsClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -225,14 +225,14 @@ func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -247,30 +247,30 @@ func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitsClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetPeeringStatsPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetPeeringStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetPeeringStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPeeringStatsPreparer prepares the GetPeeringStats request.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -293,14 +293,14 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Con
 
 // GetPeeringStatsSender sends the GetPeeringStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetPeeringStatsResponder handles the response to the GetPeeringStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,30 +314,30 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Res
 // GetStats gets all the stats from an express route circuit in a resource group.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetStatsPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetStatsPreparer prepares the GetStats request.
-func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -359,14 +359,14 @@ func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, r
 
 // GetStatsSender sends the GetStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetStatsResponder handles the response to the GetStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -380,31 +380,31 @@ func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response)
 // List gets all the express route circuits in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ExpressRouteCircuitsClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -425,14 +425,14 @@ func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -444,10 +444,10 @@ func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -455,47 +455,47 @@ func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRout
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the express route circuits in a subscription.
-func (client ExpressRouteCircuitsClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -515,14 +515,14 @@ func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -534,10 +534,10 @@ func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -545,17 +545,17 @@ func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressR
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -564,16 +564,16 @@ func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (r
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	req, err := client.ListArpTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListArpTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -581,7 +581,7 @@ func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resou
 }
 
 // ListArpTablePreparer prepares the ListArpTable request.
-func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -605,7 +605,7 @@ func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Contex
 
 // ListArpTableSender sends the ListArpTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -620,7 +620,7 @@ func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (
 
 // ListArpTableResponder handles the response to the ListArpTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -636,16 +636,16 @@ func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	req, err := client.ListRoutesTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -653,7 +653,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, re
 }
 
 // ListRoutesTablePreparer prepares the ListRoutesTable request.
-func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -677,7 +677,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Con
 
 // ListRoutesTableSender sends the ListRoutesTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -692,7 +692,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request
 
 // ListRoutesTableResponder handles the response to the ListRoutesTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -708,16 +708,16 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	req, err := client.ListRoutesTableSummaryPreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSummarySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -725,7 +725,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Cont
 }
 
 // ListRoutesTableSummaryPreparer prepares the ListRoutesTableSummary request.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -749,7 +749,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx cont
 
 // ListRoutesTableSummarySender sends the ListRoutesTableSummary request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -764,7 +764,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.
 
 // ListRoutesTableSummaryResponder handles the response to the ListRoutesTableSummary request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -779,16 +779,16 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *h
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is
 // parameters supplied to update express route circuit tags.
-func (client ExpressRouteCircuitsClient) UpdateTags(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (result ExpressRouteCircuitsUpdateTagsFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (result ExpressRouteCircuitsGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, circuitName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -796,7 +796,7 @@ func (client ExpressRouteCircuitsClient) UpdateTags(ctx context.Context, resourc
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client ExpressRouteCircuitsClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -820,7 +820,7 @@ func (client ExpressRouteCircuitsClient) UpdateTagsPreparer(ctx context.Context,
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) UpdateTagsSender(req *http.Request) (future ExpressRouteCircuitsUpdateTagsFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTagsSender(req *http.Request) (future ExpressRouteCircuitsGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -835,7 +835,7 @@ func (client ExpressRouteCircuitsClient) UpdateTagsSender(req *http.Request) (fu
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) UpdateTagsResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTagsResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/expressrouteserviceproviders.go b/services/network/mgmt/2017-09-01/network/expressrouteserviceprovidersgroup.go
similarity index 61%
rename from services/network/mgmt/2017-09-01/network/expressrouteserviceproviders.go
rename to services/network/mgmt/2017-09-01/network/expressrouteserviceprovidersgroup.go
index fa7749078b64..60cb85f86e5a 100644
--- a/services/network/mgmt/2017-09-01/network/expressrouteserviceproviders.go
+++ b/services/network/mgmt/2017-09-01/network/expressrouteserviceprovidersgroup.go
@@ -24,48 +24,49 @@ import (
 	"net/http"
 )
 
-// ExpressRouteServiceProvidersClient is the network Client
-type ExpressRouteServiceProvidersClient struct {
+// ExpressRouteServiceProvidersGroupClient is the network Client
+type ExpressRouteServiceProvidersGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteServiceProvidersClient creates an instance of the ExpressRouteServiceProvidersClient client.
-func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
-	return NewExpressRouteServiceProvidersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteServiceProvidersGroupClient creates an instance of the ExpressRouteServiceProvidersGroupClient
+// client.
+func NewExpressRouteServiceProvidersGroupClient(subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return NewExpressRouteServiceProvidersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteServiceProvidersClientWithBaseURI creates an instance of the ExpressRouteServiceProvidersClient
-// client.
-func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
-	return ExpressRouteServiceProvidersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteServiceProvidersGroupClientWithBaseURI creates an instance of the
+// ExpressRouteServiceProvidersGroupClient client.
+func NewExpressRouteServiceProvidersGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return ExpressRouteServiceProvidersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available express route service providers.
-func (client ExpressRouteServiceProvidersClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ersplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ersplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -85,14 +86,14 @@ func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteServiceProvidersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -104,10 +105,10 @@ func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Respon
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
 	req, err := lastResults.expressRouteServiceProviderListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -115,17 +116,17 @@ func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults Exp
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteServiceProvidersClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/group.go b/services/network/mgmt/2017-09-01/network/group.go
new file mode 100644
index 000000000000..d18687e8fc16
--- /dev/null
+++ b/services/network/mgmt/2017-09-01/network/group.go
@@ -0,0 +1,107 @@
+package network
+
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"context"
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"net/http"
+)
+
+// GroupClient is the network Client
+type GroupClient struct {
+	BaseClient
+}
+
+// NewGroupClient creates an instance of the GroupClient client.
+func NewGroupClient(subscriptionID string) GroupClient {
+	return NewGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
+}
+
+// NewGroupClientWithBaseURI creates an instance of the GroupClient client.
+func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
+	return GroupClient{NewWithBaseURI(baseURI, subscriptionID)}
+}
+
+// CheckDNSNameAvailability checks whether a domain name in the cloudapp.azure.com zone is available for use.
+//
+// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
+// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+func (client GroupClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
+	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := client.CheckDNSNameAvailabilitySender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure sending request")
+		return
+	}
+
+	result, err = client.CheckDNSNameAvailabilityResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
+	}
+
+	return
+}
+
+// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
+func (client GroupClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
+	pathParameters := map[string]interface{}{
+		"location":       autorest.Encode("path", location),
+		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
+	}
+
+	const APIVersion = "2017-09-01"
+	queryParameters := map[string]interface{}{
+		"api-version":     APIVersion,
+		"domainNameLabel": autorest.Encode("query", domainNameLabel),
+	}
+
+	preparer := autorest.CreatePreparer(
+		autorest.AsGet(),
+		autorest.WithBaseURL(client.BaseURI),
+		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
+		autorest.WithQueryParameters(queryParameters))
+	return preparer.Prepare((&http.Request{}).WithContext(ctx))
+}
+
+// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
+// http.Response Body if it receives an error.
+func (client GroupClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
+	return autorest.SendWithSender(client, req,
+		azure.DoRetryWithRegistration(client.Client))
+}
+
+// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
+// closes the http.Response Body.
+func (client GroupClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
+	err = autorest.Respond(
+		resp,
+		client.ByInspecting(),
+		azure.WithErrorUnlessStatusCode(http.StatusOK),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}
diff --git a/services/network/mgmt/2017-09-01/network/inboundnatrules.go b/services/network/mgmt/2017-09-01/network/inboundnatrulesgroup.go
similarity index 74%
rename from services/network/mgmt/2017-09-01/network/inboundnatrules.go
rename to services/network/mgmt/2017-09-01/network/inboundnatrulesgroup.go
index f582c18247ba..26be0c2cb7cf 100644
--- a/services/network/mgmt/2017-09-01/network/inboundnatrules.go
+++ b/services/network/mgmt/2017-09-01/network/inboundnatrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// InboundNatRulesClient is the network Client
-type InboundNatRulesClient struct {
+// InboundNatRulesGroupClient is the network Client
+type InboundNatRulesGroupClient struct {
 	BaseClient
 }
 
-// NewInboundNatRulesClient creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClient(subscriptionID string) InboundNatRulesClient {
-	return NewInboundNatRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInboundNatRulesGroupClient creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClient(subscriptionID string) InboundNatRulesGroupClient {
+	return NewInboundNatRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInboundNatRulesClientWithBaseURI creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesClient {
-	return InboundNatRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInboundNatRulesGroupClientWithBaseURI creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesGroupClient {
+	return InboundNatRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer inbound nat rule.
@@ -45,7 +45,7 @@ func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. inboundNatRuleParameters is parameters supplied to the
 // create or update inbound nat rule operation.
-func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: inboundNatRuleParameters,
 			Constraints: []validation.Constraint{{Target: "inboundNatRuleParameters.InboundNatRulePropertiesFormat", Name: validation.Null, Rule: false,
@@ -62,18 +62,18 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 						}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.InboundNatRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.InboundNatRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -81,7 +81,7 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -106,7 +106,7 @@ func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -121,7 +121,7 @@ func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -136,16 +136,16 @@ func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule.
-func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -153,7 +153,7 @@ func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -176,7 +176,7 @@ func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) DeleteSender(req *http.Request) (future InboundNatRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -191,7 +191,7 @@ func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future Inbo
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InboundNatRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -205,30 +205,30 @@ func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. expand is expands referenced resources.
-func (client InboundNatRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -254,14 +254,14 @@ func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -275,31 +275,31 @@ func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result In
 // List gets all the inbound nat rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client InboundNatRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
+func (client InboundNatRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.inrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.inrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -321,14 +321,14 @@ func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -340,10 +340,10 @@ func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result I
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
 	req, err := lastResults.inboundNatRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -351,17 +351,17 @@ func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InboundNatRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
+func (client InboundNatRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/interfaceipconfigurations.go b/services/network/mgmt/2017-09-01/network/interfaceipconfigurationsgroup.go
similarity index 66%
rename from services/network/mgmt/2017-09-01/network/interfaceipconfigurations.go
rename to services/network/mgmt/2017-09-01/network/interfaceipconfigurationsgroup.go
index 2dd80011c8c5..ecf8e18b1c21 100644
--- a/services/network/mgmt/2017-09-01/network/interfaceipconfigurations.go
+++ b/services/network/mgmt/2017-09-01/network/interfaceipconfigurationsgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// InterfaceIPConfigurationsClient is the network Client
-type InterfaceIPConfigurationsClient struct {
+// InterfaceIPConfigurationsGroupClient is the network Client
+type InterfaceIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceIPConfigurationsClient creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClient(subscriptionID string) InterfaceIPConfigurationsClient {
-	return NewInterfaceIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceIPConfigurationsGroupClient creates an instance of the InterfaceIPConfigurationsGroupClient client.
+func NewInterfaceIPConfigurationsGroupClient(subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return NewInterfaceIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceIPConfigurationsClientWithBaseURI creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsClient {
-	return InterfaceIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceIPConfigurationsGroupClientWithBaseURI creates an instance of the InterfaceIPConfigurationsGroupClient
+// client.
+func NewInterfaceIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return InterfaceIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified network interface ip configuration.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // IPConfigurationName is the name of the ip configuration name.
-func (client InterfaceIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":  autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
@@ -89,14 +90,14 @@ func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, r
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +111,31 @@ func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response)
 // List get all ip configurations in a network interface
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
+func (client InterfaceIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.iiclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.iiclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -156,14 +157,14 @@ func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +176,10 @@ func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceIPConfigurationsClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
 	req, err := lastResults.interfaceIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +187,17 @@ func (client InterfaceIPConfigurationsClient) listNextResults(lastResults Interf
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/interfaceloadbalancers.go b/services/network/mgmt/2017-09-01/network/interfaceloadbalancersgroup.go
similarity index 63%
rename from services/network/mgmt/2017-09-01/network/interfaceloadbalancers.go
rename to services/network/mgmt/2017-09-01/network/interfaceloadbalancersgroup.go
index 70ce83314ff8..bd9ee0d2552b 100644
--- a/services/network/mgmt/2017-09-01/network/interfaceloadbalancers.go
+++ b/services/network/mgmt/2017-09-01/network/interfaceloadbalancersgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// InterfaceLoadBalancersClient is the network Client
-type InterfaceLoadBalancersClient struct {
+// InterfaceLoadBalancersGroupClient is the network Client
+type InterfaceLoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceLoadBalancersClient creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClient(subscriptionID string) InterfaceLoadBalancersClient {
-	return NewInterfaceLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceLoadBalancersGroupClient creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClient(subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return NewInterfaceLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceLoadBalancersClientWithBaseURI creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersClient {
-	return InterfaceLoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceLoadBalancersGroupClientWithBaseURI creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return InterfaceLoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list all load balancers in a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceLoadBalancersClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
+func (client InterfaceLoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceLoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -88,14 +88,14 @@ func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceLoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceLoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -107,10 +107,10 @@ func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceLoadBalancersClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
 	req, err := lastResults.interfaceLoadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -118,17 +118,17 @@ func (client InterfaceLoadBalancersClient) listNextResults(lastResults Interface
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceLoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/interfaces.go b/services/network/mgmt/2017-09-01/network/interfacesgroup.go
similarity index 66%
rename from services/network/mgmt/2017-09-01/network/interfaces.go
rename to services/network/mgmt/2017-09-01/network/interfacesgroup.go
index fc6eddebd2ff..15754fc15bc5 100644
--- a/services/network/mgmt/2017-09-01/network/interfaces.go
+++ b/services/network/mgmt/2017-09-01/network/interfacesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// InterfacesClient is the network Client
-type InterfacesClient struct {
+// InterfacesGroupClient is the network Client
+type InterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewInterfacesClient creates an instance of the InterfacesClient client.
-func NewInterfacesClient(subscriptionID string) InterfacesClient {
-	return NewInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfacesGroupClient creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClient(subscriptionID string) InterfacesGroupClient {
+	return NewInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfacesClientWithBaseURI creates an instance of the InterfacesClient client.
-func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
-	return InterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfacesGroupClientWithBaseURI creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfacesGroupClient {
+	return InterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // parameters is parameters supplied to the create or update network interface operation.
-func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkInterfaceName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroup
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
+func (client InterfacesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resou
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateSender(req *http.Request) (future InterfacesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future I
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (res
 // Delete deletes the specified network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName str
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroup
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) DeleteSender(req *http.Request) (future InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) DeleteSender(req *http.Request) (future InterfacesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client InterfacesClient) DeleteSender(req *http.Request) (future Interface
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InterfacesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client InterfacesClient) DeleteResponder(resp *http.Response) (result auto
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // expand is expands referenced resources.
-func (client InterfacesClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupNam
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,16 +250,16 @@ func (client InterfacesClient) GetResponder(resp *http.Response) (result Interfa
 // GetEffectiveRouteTable gets all route tables applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	req, err := client.GetEffectiveRouteTablePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetEffectiveRouteTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -267,7 +267,7 @@ func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resou
 }
 
 // GetEffectiveRouteTablePreparer prepares the GetEffectiveRouteTable request.
-func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -289,7 +289,7 @@ func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Contex
 
 // GetEffectiveRouteTableSender sends the GetEffectiveRouteTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -304,7 +304,7 @@ func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (
 
 // GetEffectiveRouteTableResponder handles the response to the GetEffectiveRouteTable request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -322,30 +322,30 @@ func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Respon
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. IPConfigurationName is the name of the ip configuration. expand is expands referenced
 // resources.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfiguration(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (result InterfaceIPConfiguration, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfiguration(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (result InterfaceIPConfiguration, err error) {
 	req, err := client.GetVirtualMachineScaleSetIPConfigurationPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetIPConfiguration", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetIPConfiguration", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetIPConfigurationSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetIPConfigurationResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetIPConfigurationPreparer prepares the GetVirtualMachineScaleSetIPConfiguration request.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfigurationPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -373,14 +373,14 @@ func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationPreparer(
 
 // GetVirtualMachineScaleSetIPConfigurationSender sends the GetVirtualMachineScaleSetIPConfiguration request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfigurationSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetIPConfigurationResponder handles the response to the GetVirtualMachineScaleSetIPConfiguration request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfigurationResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -396,30 +396,30 @@ func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationResponder
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. expand is expands referenced resources.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetNetworkInterfaceSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetNetworkInterfaceResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetNetworkInterfacePreparer prepares the GetVirtualMachineScaleSetNetworkInterface request.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
@@ -446,14 +446,14 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer
 
 // GetVirtualMachineScaleSetNetworkInterfaceSender sends the GetVirtualMachineScaleSetNetworkInterface request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetNetworkInterfaceResponder handles the response to the GetVirtualMachineScaleSetNetworkInterface request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -467,31 +467,31 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponde
 // List gets all network interfaces in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client InterfacesClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -512,14 +512,14 @@ func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupNa
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -531,10 +531,10 @@ func (client InterfacesClient) ListResponder(resp *http.Response) (result Interf
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -542,47 +542,47 @@ func (client InterfacesClient) listNextResults(lastResults InterfaceListResult)
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network interfaces in a subscription.
-func (client InterfacesClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client InterfacesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -602,14 +602,14 @@ func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Reque
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -621,10 +621,10 @@ func (client InterfacesClient) ListAllResponder(resp *http.Response) (result Int
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -632,17 +632,17 @@ func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResul
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -650,16 +650,16 @@ func (client InterfacesClient) ListAllComplete(ctx context.Context) (result Inte
 // ListEffectiveNetworkSecurityGroups gets all network security groups applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	req, err := client.ListEffectiveNetworkSecurityGroupsPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListEffectiveNetworkSecurityGroupsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -667,7 +667,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Co
 }
 
 // ListEffectiveNetworkSecurityGroupsPreparer prepares the ListEffectiveNetworkSecurityGroups request.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -689,7 +689,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx co
 
 // ListEffectiveNetworkSecurityGroupsSender sends the ListEffectiveNetworkSecurityGroups request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -704,7 +704,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *htt
 
 // ListEffectiveNetworkSecurityGroupsResponder handles the response to the ListEffectiveNetworkSecurityGroups request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -721,31 +721,31 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. expand is expands referenced resources.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurations(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurations(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetIPConfigurationsNextResults
 	req, err := client.ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetIPConfigurations", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetIPConfigurations", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetIPConfigurationsSender(req)
 	if err != nil {
 		result.iiclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure sending request")
 		return
 	}
 
 	result.iiclr, err = client.ListVirtualMachineScaleSetIPConfigurationsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetIPConfigurationsPreparer prepares the ListVirtualMachineScaleSetIPConfigurations request.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
@@ -772,14 +772,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsPrepare
 
 // ListVirtualMachineScaleSetIPConfigurationsSender sends the ListVirtualMachineScaleSetIPConfigurations request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetIPConfigurationsResponder handles the response to the ListVirtualMachineScaleSetIPConfigurations request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -791,10 +791,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsRespond
 }
 
 // listVirtualMachineScaleSetIPConfigurationsNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetIPConfigurationsNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetIPConfigurationsNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
 	req, err := lastResults.interfaceIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -802,17 +802,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetIPConfigurationsNextRes
 	resp, err := client.ListVirtualMachineScaleSetIPConfigurationsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetIPConfigurationsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetIPConfigurationsComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetIPConfigurations(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	return
 }
@@ -821,31 +821,31 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsComplet
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -867,14 +867,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPrepar
 
 // ListVirtualMachineScaleSetNetworkInterfacesSender sends the ListVirtualMachineScaleSetNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -886,10 +886,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesRespon
 }
 
 // listVirtualMachineScaleSetNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -897,17 +897,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextRe
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -917,31 +917,31 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComple
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetVMNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -964,14 +964,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPrep
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesSender sends the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -983,10 +983,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResp
 }
 
 // listVirtualMachineScaleSetVMNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -994,17 +994,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNext
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	return
 }
@@ -1013,16 +1013,16 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComp
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // parameters is parameters supplied to update network interface tags.
-func (client InterfacesClient) UpdateTags(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (result InterfacesUpdateTagsFuture, err error) {
+func (client InterfacesGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (result InterfacesGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkInterfaceName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1030,7 +1030,7 @@ func (client InterfacesClient) UpdateTags(ctx context.Context, resourceGroupName
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client InterfacesClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (*http.Request, error) {
+func (client InterfacesGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -1054,7 +1054,7 @@ func (client InterfacesClient) UpdateTagsPreparer(ctx context.Context, resourceG
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) UpdateTagsSender(req *http.Request) (future InterfacesUpdateTagsFuture, err error) {
+func (client InterfacesGroupClient) UpdateTagsSender(req *http.Request) (future InterfacesGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1069,7 +1069,7 @@ func (client InterfacesClient) UpdateTagsSender(req *http.Request) (future Inter
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) UpdateTagsResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) UpdateTagsResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspools.go b/services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspoolsgroup.go
similarity index 64%
rename from services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspools.go
rename to services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspoolsgroup.go
index ba40d22e4b06..a47732437360 100644
--- a/services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspools.go
+++ b/services/network/mgmt/2017-09-01/network/loadbalancerbackendaddresspoolsgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerBackendAddressPoolsClient is the network Client
-type LoadBalancerBackendAddressPoolsClient struct {
+// LoadBalancerBackendAddressPoolsGroupClient is the network Client
+type LoadBalancerBackendAddressPoolsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerBackendAddressPoolsClient creates an instance of the LoadBalancerBackendAddressPoolsClient client.
-func NewLoadBalancerBackendAddressPoolsClient(subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return NewLoadBalancerBackendAddressPoolsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerBackendAddressPoolsGroupClient creates an instance of the LoadBalancerBackendAddressPoolsGroupClient
+// client.
+func NewLoadBalancerBackendAddressPoolsGroupClient(subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerBackendAddressPoolsClientWithBaseURI creates an instance of the LoadBalancerBackendAddressPoolsClient
-// client.
-func NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return LoadBalancerBackendAddressPoolsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerBackendAddressPoolsGroupClient client.
+func NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return LoadBalancerBackendAddressPoolsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer backend address pool.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // backendAddressPoolName is the name of the backend address pool.
-func (client LoadBalancerBackendAddressPoolsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, backendAddressPoolName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"backendAddressPoolName": autorest.Encode("path", backendAddressPoolName),
 		"loadBalancerName":       autorest.Encode("path", loadBalancerName),
@@ -90,14 +91,14 @@ func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Cont
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Resp
 // List gets all the load balancer backed address pools.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerBackendAddressPoolsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbbaplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbbaplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Con
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	req, err := lastResults.loadBalancerBackendAddressPoolListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerBackendAddressPoolsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurations.go b/services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurationsgroup.go
similarity index 63%
rename from services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurations.go
rename to services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurationsgroup.go
index 36b9abee94de..7a48634bc02d 100644
--- a/services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurations.go
+++ b/services/network/mgmt/2017-09-01/network/loadbalancerfrontendipconfigurationsgroup.go
@@ -24,51 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerFrontendIPConfigurationsClient is the network Client
-type LoadBalancerFrontendIPConfigurationsClient struct {
+// LoadBalancerFrontendIPConfigurationsGroupClient is the network Client
+type LoadBalancerFrontendIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClient creates an instance of the LoadBalancerFrontendIPConfigurationsClient
-// client.
-func NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerFrontendIPConfigurationsGroupClient creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI creates an instance of the
-// LoadBalancerFrontendIPConfigurationsClient client.
-func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return LoadBalancerFrontendIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return LoadBalancerFrontendIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer frontend IP configuration.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // frontendIPConfigurationName is the name of the frontend IP configuration.
-func (client LoadBalancerFrontendIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, frontendIPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"frontendIPConfigurationName": autorest.Encode("path", frontendIPConfigurationName),
 		"loadBalancerName":            autorest.Encode("path", loadBalancerName),
@@ -91,14 +91,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -112,31 +112,31 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http
 // List gets all the load balancer frontend IP configurations.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerFrontendIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbficlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbficlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -158,14 +158,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -177,10 +177,10 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *htt
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	req, err := lastResults.loadBalancerFrontendIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -188,17 +188,17 @@ func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastRes
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrules.go b/services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrulesgroup.go
similarity index 65%
rename from services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrules.go
rename to services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrulesgroup.go
index f8ef90aaff5d..2278990beb1f 100644
--- a/services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrules.go
+++ b/services/network/mgmt/2017-09-01/network/loadbalancerloadbalancingrulesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerLoadBalancingRulesClient is the network Client
-type LoadBalancerLoadBalancingRulesClient struct {
+// LoadBalancerLoadBalancingRulesGroupClient is the network Client
+type LoadBalancerLoadBalancingRulesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerLoadBalancingRulesClient creates an instance of the LoadBalancerLoadBalancingRulesClient client.
-func NewLoadBalancerLoadBalancingRulesClient(subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return NewLoadBalancerLoadBalancingRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerLoadBalancingRulesGroupClient creates an instance of the LoadBalancerLoadBalancingRulesGroupClient
+// client.
+func NewLoadBalancerLoadBalancingRulesGroupClient(subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerLoadBalancingRulesClientWithBaseURI creates an instance of the LoadBalancerLoadBalancingRulesClient
-// client.
-func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return LoadBalancerLoadBalancingRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerLoadBalancingRulesGroupClient client.
+func NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return LoadBalancerLoadBalancingRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified load balancer load balancing rule.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // loadBalancingRuleName is the name of the load balancing rule.
-func (client LoadBalancerLoadBalancingRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, loadBalancingRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":      autorest.Encode("path", loadBalancerName),
 		"loadBalancingRuleName": autorest.Encode("path", loadBalancingRuleName),
@@ -90,14 +91,14 @@ func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Conte
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Respo
 // List gets all the load balancing rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerLoadBalancingRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblbrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblbrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Cont
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Resp
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	req, err := lastResults.loadBalancerLoadBalancingRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults L
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerLoadBalancingRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfaces.go b/services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfacesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfaces.go
rename to services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfacesgroup.go
index 20809d284ef8..5fbb99c1eaac 100644
--- a/services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfaces.go
+++ b/services/network/mgmt/2017-09-01/network/loadbalancernetworkinterfacesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerNetworkInterfacesClient is the network Client
-type LoadBalancerNetworkInterfacesClient struct {
+// LoadBalancerNetworkInterfacesGroupClient is the network Client
+type LoadBalancerNetworkInterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerNetworkInterfacesClient creates an instance of the LoadBalancerNetworkInterfacesClient client.
-func NewLoadBalancerNetworkInterfacesClient(subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return NewLoadBalancerNetworkInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerNetworkInterfacesGroupClient creates an instance of the LoadBalancerNetworkInterfacesGroupClient
+// client.
+func NewLoadBalancerNetworkInterfacesGroupClient(subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerNetworkInterfacesClientWithBaseURI creates an instance of the LoadBalancerNetworkInterfacesClient
-// client.
-func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return LoadBalancerNetworkInterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerNetworkInterfacesGroupClient client.
+func NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return LoadBalancerNetworkInterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets associated load balancer network interfaces.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerNetworkInterfacesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -89,14 +90,14 @@ func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Conte
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerNetworkInterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -108,10 +109,10 @@ func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Respo
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -119,17 +120,17 @@ func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults In
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerNetworkInterfacesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/loadbalancerprobes.go b/services/network/mgmt/2017-09-01/network/loadbalancerprobesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-09-01/network/loadbalancerprobes.go
rename to services/network/mgmt/2017-09-01/network/loadbalancerprobesgroup.go
index ae7ba4ebdf00..9be0ad49b188 100644
--- a/services/network/mgmt/2017-09-01/network/loadbalancerprobes.go
+++ b/services/network/mgmt/2017-09-01/network/loadbalancerprobesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// LoadBalancerProbesClient is the network Client
-type LoadBalancerProbesClient struct {
+// LoadBalancerProbesGroupClient is the network Client
+type LoadBalancerProbesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerProbesClient creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClient(subscriptionID string) LoadBalancerProbesClient {
-	return NewLoadBalancerProbesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerProbesGroupClient creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClient(subscriptionID string) LoadBalancerProbesGroupClient {
+	return NewLoadBalancerProbesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerProbesClientWithBaseURI creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesClient {
-	return LoadBalancerProbesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerProbesGroupClientWithBaseURI creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesGroupClient {
+	return LoadBalancerProbesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer probe.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // probeName is the name of the probe.
-func (client LoadBalancerProbesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, probeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"probeName":         autorest.Encode("path", probeName),
@@ -89,14 +89,14 @@ func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resource
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) GetResponder(resp *http.Response) (result Probe, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +110,31 @@ func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result
 // List gets all the load balancer probes.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerProbesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
+func (client LoadBalancerProbesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -156,14 +156,14 @@ func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourc
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +175,10 @@ func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (resul
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
 	req, err := lastResults.loadBalancerProbeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +186,17 @@ func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerP
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerProbesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
+func (client LoadBalancerProbesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/loadbalancers.go b/services/network/mgmt/2017-09-01/network/loadbalancersgroup.go
similarity index 66%
rename from services/network/mgmt/2017-09-01/network/loadbalancers.go
rename to services/network/mgmt/2017-09-01/network/loadbalancersgroup.go
index abde569832dc..4afd0ef36750 100644
--- a/services/network/mgmt/2017-09-01/network/loadbalancers.go
+++ b/services/network/mgmt/2017-09-01/network/loadbalancersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// LoadBalancersClient is the network Client
-type LoadBalancersClient struct {
+// LoadBalancersGroupClient is the network Client
+type LoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancersClient creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClient(subscriptionID string) LoadBalancersClient {
-	return NewLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancersGroupClient creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClient(subscriptionID string) LoadBalancersGroupClient {
+	return NewLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancersClientWithBaseURI creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersClient {
-	return LoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancersGroupClientWithBaseURI creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersGroupClient {
+	return LoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // parameters is parameters supplied to the create or update load balancer operation.
-func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
+func (client LoadBalancersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (
 // Delete deletes the specified load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) DeleteSender(req *http.Request) (future LoadBalancersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBa
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LoadBalancersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. expand
 // is expands referenced resources.
-func (client LoadBalancersClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client LoadBalancersClient) GetResponder(resp *http.Response) (result Load
 // List gets all the load balancers in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LoadBalancersClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client LoadBalancersClient) ListResponder(resp *http.Response) (result Loa
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the load balancers in a subscription.
-func (client LoadBalancersClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Re
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerLis
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -434,16 +434,16 @@ func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result L
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // parameters is parameters supplied to update load balancer tags.
-func (client LoadBalancersClient) UpdateTags(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (result LoadBalancersUpdateTagsFuture, err error) {
+func (client LoadBalancersGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (result LoadBalancersGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, loadBalancerName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client LoadBalancersClient) UpdateTags(ctx context.Context, resourceGroupN
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client LoadBalancersClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (*http.Request, error) {
+func (client LoadBalancersGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -475,7 +475,7 @@ func (client LoadBalancersClient) UpdateTagsPreparer(ctx context.Context, resour
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) UpdateTagsSender(req *http.Request) (future LoadBalancersUpdateTagsFuture, err error) {
+func (client LoadBalancersGroupClient) UpdateTagsSender(req *http.Request) (future LoadBalancersGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client LoadBalancersClient) UpdateTagsSender(req *http.Request) (future Lo
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) UpdateTagsResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) UpdateTagsResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/localnetworkgateways.go b/services/network/mgmt/2017-09-01/network/localnetworkgatewaysgroup.go
similarity index 72%
rename from services/network/mgmt/2017-09-01/network/localnetworkgateways.go
rename to services/network/mgmt/2017-09-01/network/localnetworkgatewaysgroup.go
index 47afe0b3cb3c..8dabaa10a972 100644
--- a/services/network/mgmt/2017-09-01/network/localnetworkgateways.go
+++ b/services/network/mgmt/2017-09-01/network/localnetworkgatewaysgroup.go
@@ -25,43 +25,43 @@ import (
 	"net/http"
 )
 
-// LocalNetworkGatewaysClient is the network Client
-type LocalNetworkGatewaysClient struct {
+// LocalNetworkGatewaysGroupClient is the network Client
+type LocalNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewLocalNetworkGatewaysClient creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
-	return NewLocalNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLocalNetworkGatewaysGroupClient creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClient(subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return NewLocalNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLocalNetworkGatewaysClientWithBaseURI creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
-	return LocalNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLocalNetworkGatewaysGroupClientWithBaseURI creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return LocalNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a local network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway. parameters is parameters supplied to the create or update local network gateway operation.
-func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}},
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, localNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -69,7 +69,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -93,7 +93,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -108,7 +108,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -123,22 +123,22 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Resp
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Delete", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Delete", err.Error())
 	}
 
 	req, err := client.DeletePreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -146,7 +146,7 @@ func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -168,7 +168,7 @@ func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -183,7 +183,7 @@ func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -197,36 +197,36 @@ func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Get", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Get", err.Error())
 	}
 
 	req, err := client.GetPreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -248,14 +248,14 @@ func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -269,31 +269,31 @@ func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (resu
 // List gets all the local network gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LocalNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
+func (client LocalNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -314,14 +314,14 @@ func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,10 +333,10 @@ func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
 	req, err := lastResults.localNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -344,17 +344,17 @@ func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetwor
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -363,22 +363,22 @@ func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resou
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway. parameters is parameters supplied to update local network gateway tags.
-func (client LocalNetworkGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (result LocalNetworkGatewaysUpdateTagsFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (result LocalNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "UpdateTags", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "UpdateTags", err.Error())
 	}
 
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, localNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -386,7 +386,7 @@ func (client LocalNetworkGatewaysClient) UpdateTags(ctx context.Context, resourc
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client LocalNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -410,7 +410,7 @@ func (client LocalNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context,
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (future LocalNetworkGatewaysUpdateTagsFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTagsSender(req *http.Request) (future LocalNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -425,7 +425,7 @@ func (client LocalNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (fu
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) UpdateTagsResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTagsResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/models.go b/services/network/mgmt/2017-09-01/network/models.go
index 97120dcb7ac1..85cc18e60f94 100644
--- a/services/network/mgmt/2017-09-01/network/models.go
+++ b/services/network/mgmt/2017-09-01/network/models.go
@@ -36,6 +36,11 @@ const (
 	Deny Access = "Deny"
 )
 
+// PossibleAccessValues returns an array of possible values for the Access const type.
+func PossibleAccessValues() [2]Access {
+	return [2]Access{Allow, Deny}
+}
+
 // ApplicationGatewayBackendHealthServerHealth enumerates the values for application gateway backend health
 // server health.
 type ApplicationGatewayBackendHealthServerHealth string
@@ -53,6 +58,11 @@ const (
 	Up ApplicationGatewayBackendHealthServerHealth = "Up"
 )
 
+// PossibleApplicationGatewayBackendHealthServerHealthValues returns an array of possible values for the ApplicationGatewayBackendHealthServerHealth const type.
+func PossibleApplicationGatewayBackendHealthServerHealthValues() [5]ApplicationGatewayBackendHealthServerHealth {
+	return [5]ApplicationGatewayBackendHealthServerHealth{Down, Draining, Partial, Unknown, Up}
+}
+
 // ApplicationGatewayCookieBasedAffinity enumerates the values for application gateway cookie based affinity.
 type ApplicationGatewayCookieBasedAffinity string
 
@@ -63,6 +73,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayFirewallMode enumerates the values for application gateway firewall mode.
 type ApplicationGatewayFirewallMode string
 
@@ -73,6 +88,11 @@ const (
 	Prevention ApplicationGatewayFirewallMode = "Prevention"
 )
 
+// PossibleApplicationGatewayFirewallModeValues returns an array of possible values for the ApplicationGatewayFirewallMode const type.
+func PossibleApplicationGatewayFirewallModeValues() [2]ApplicationGatewayFirewallMode {
+	return [2]ApplicationGatewayFirewallMode{Detection, Prevention}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -87,6 +107,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -97,6 +122,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRedirectType enumerates the values for application gateway redirect type.
 type ApplicationGatewayRedirectType string
 
@@ -111,6 +141,11 @@ const (
 	Temporary ApplicationGatewayRedirectType = "Temporary"
 )
 
+// PossibleApplicationGatewayRedirectTypeValues returns an array of possible values for the ApplicationGatewayRedirectType const type.
+func PossibleApplicationGatewayRedirectTypeValues() [4]ApplicationGatewayRedirectType {
+	return [4]ApplicationGatewayRedirectType{Found, Permanent, SeeOther, Temporary}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -122,6 +157,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -138,6 +178,11 @@ const (
 	WAFMedium ApplicationGatewaySkuName = "WAF_Medium"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [5]ApplicationGatewaySkuName {
+	return [5]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall, WAFLarge, WAFMedium}
+}
+
 // ApplicationGatewaySslCipherSuite enumerates the values for application gateway ssl cipher suite.
 type ApplicationGatewaySslCipherSuite string
 
@@ -194,6 +239,11 @@ const (
 	TLSRSAWITHAES256GCMSHA384 ApplicationGatewaySslCipherSuite = "TLS_RSA_WITH_AES_256_GCM_SHA384"
 )
 
+// PossibleApplicationGatewaySslCipherSuiteValues returns an array of possible values for the ApplicationGatewaySslCipherSuite const type.
+func PossibleApplicationGatewaySslCipherSuiteValues() [25]ApplicationGatewaySslCipherSuite {
+	return [25]ApplicationGatewaySslCipherSuite{TLSDHEDSSWITHAES128CBCSHA, TLSDHEDSSWITHAES128CBCSHA256, TLSDHEDSSWITHAES256CBCSHA, TLSDHEDSSWITHAES256CBCSHA256, TLSDHERSAWITHAES128CBCSHA, TLSDHERSAWITHAES128GCMSHA256, TLSDHERSAWITHAES256CBCSHA, TLSDHERSAWITHAES256GCMSHA384, TLSECDHEECDSAWITHAES128CBCSHA, TLSECDHEECDSAWITHAES128CBCSHA256, TLSECDHEECDSAWITHAES128GCMSHA256, TLSECDHEECDSAWITHAES256CBCSHA, TLSECDHEECDSAWITHAES256CBCSHA384, TLSECDHEECDSAWITHAES256GCMSHA384, TLSECDHERSAWITHAES128CBCSHA, TLSECDHERSAWITHAES128CBCSHA256, TLSECDHERSAWITHAES256CBCSHA, TLSECDHERSAWITHAES256CBCSHA384, TLSRSAWITH3DESEDECBCSHA, TLSRSAWITHAES128CBCSHA, TLSRSAWITHAES128CBCSHA256, TLSRSAWITHAES128GCMSHA256, TLSRSAWITHAES256CBCSHA, TLSRSAWITHAES256CBCSHA256, TLSRSAWITHAES256GCMSHA384}
+}
+
 // ApplicationGatewaySslPolicyName enumerates the values for application gateway ssl policy name.
 type ApplicationGatewaySslPolicyName string
 
@@ -206,6 +256,11 @@ const (
 	AppGwSslPolicy20170401S ApplicationGatewaySslPolicyName = "AppGwSslPolicy20170401S"
 )
 
+// PossibleApplicationGatewaySslPolicyNameValues returns an array of possible values for the ApplicationGatewaySslPolicyName const type.
+func PossibleApplicationGatewaySslPolicyNameValues() [3]ApplicationGatewaySslPolicyName {
+	return [3]ApplicationGatewaySslPolicyName{AppGwSslPolicy20150501, AppGwSslPolicy20170401, AppGwSslPolicy20170401S}
+}
+
 // ApplicationGatewaySslPolicyType enumerates the values for application gateway ssl policy type.
 type ApplicationGatewaySslPolicyType string
 
@@ -216,6 +271,11 @@ const (
 	Predefined ApplicationGatewaySslPolicyType = "Predefined"
 )
 
+// PossibleApplicationGatewaySslPolicyTypeValues returns an array of possible values for the ApplicationGatewaySslPolicyType const type.
+func PossibleApplicationGatewaySslPolicyTypeValues() [2]ApplicationGatewaySslPolicyType {
+	return [2]ApplicationGatewaySslPolicyType{Custom, Predefined}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -228,6 +288,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -238,6 +303,11 @@ const (
 	WAF ApplicationGatewayTier = "WAF"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [2]ApplicationGatewayTier {
+	return [2]ApplicationGatewayTier{Standard, WAF}
+}
+
 // AssociationType enumerates the values for association type.
 type AssociationType string
 
@@ -248,6 +318,11 @@ const (
 	Contains AssociationType = "Contains"
 )
 
+// PossibleAssociationTypeValues returns an array of possible values for the AssociationType const type.
+func PossibleAssociationTypeValues() [2]AssociationType {
+	return [2]AssociationType{Associated, Contains}
+}
+
 // AuthenticationMethod enumerates the values for authentication method.
 type AuthenticationMethod string
 
@@ -258,6 +333,11 @@ const (
 	EAPTLS AuthenticationMethod = "EAPTLS"
 )
 
+// PossibleAuthenticationMethodValues returns an array of possible values for the AuthenticationMethod const type.
+func PossibleAuthenticationMethodValues() [2]AuthenticationMethod {
+	return [2]AuthenticationMethod{EAPMSCHAPv2, EAPTLS}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -268,6 +348,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // BgpPeerState enumerates the values for bgp peer state.
 type BgpPeerState string
 
@@ -284,6 +369,11 @@ const (
 	BgpPeerStateUnknown BgpPeerState = "Unknown"
 )
 
+// PossibleBgpPeerStateValues returns an array of possible values for the BgpPeerState const type.
+func PossibleBgpPeerStateValues() [5]BgpPeerState {
+	return [5]BgpPeerState{BgpPeerStateConnected, BgpPeerStateConnecting, BgpPeerStateIdle, BgpPeerStateStopped, BgpPeerStateUnknown}
+}
+
 // ConnectionStatus enumerates the values for connection status.
 type ConnectionStatus string
 
@@ -298,6 +388,11 @@ const (
 	ConnectionStatusUnknown ConnectionStatus = "Unknown"
 )
 
+// PossibleConnectionStatusValues returns an array of possible values for the ConnectionStatus const type.
+func PossibleConnectionStatusValues() [4]ConnectionStatus {
+	return [4]ConnectionStatus{ConnectionStatusConnected, ConnectionStatusDegraded, ConnectionStatusDisconnected, ConnectionStatusUnknown}
+}
+
 // DhGroup enumerates the values for dh group.
 type DhGroup string
 
@@ -320,6 +415,11 @@ const (
 	None DhGroup = "None"
 )
 
+// PossibleDhGroupValues returns an array of possible values for the DhGroup const type.
+func PossibleDhGroupValues() [8]DhGroup {
+	return [8]DhGroup{DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+}
+
 // Direction enumerates the values for direction.
 type Direction string
 
@@ -330,6 +430,11 @@ const (
 	Outbound Direction = "Outbound"
 )
 
+// PossibleDirectionValues returns an array of possible values for the Direction const type.
+func PossibleDirectionValues() [2]Direction {
+	return [2]Direction{Inbound, Outbound}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -344,6 +449,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -354,6 +464,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // EffectiveSecurityRuleProtocol enumerates the values for effective security rule protocol.
 type EffectiveSecurityRuleProtocol string
 
@@ -366,6 +481,11 @@ const (
 	UDP EffectiveSecurityRuleProtocol = "Udp"
 )
 
+// PossibleEffectiveSecurityRuleProtocolValues returns an array of possible values for the EffectiveSecurityRuleProtocol const type.
+func PossibleEffectiveSecurityRuleProtocolValues() [3]EffectiveSecurityRuleProtocol {
+	return [3]EffectiveSecurityRuleProtocol{All, TCP, UDP}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -381,6 +501,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -391,6 +516,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -403,6 +533,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -413,6 +548,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -423,6 +563,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IkeEncryption enumerates the values for ike encryption.
 type IkeEncryption string
 
@@ -439,6 +584,11 @@ const (
 	DES3 IkeEncryption = "DES3"
 )
 
+// PossibleIkeEncryptionValues returns an array of possible values for the IkeEncryption const type.
+func PossibleIkeEncryptionValues() [5]IkeEncryption {
+	return [5]IkeEncryption{AES128, AES192, AES256, DES, DES3}
+}
+
 // IkeIntegrity enumerates the values for ike integrity.
 type IkeIntegrity string
 
@@ -453,6 +603,11 @@ const (
 	SHA384 IkeIntegrity = "SHA384"
 )
 
+// PossibleIkeIntegrityValues returns an array of possible values for the IkeIntegrity const type.
+func PossibleIkeIntegrityValues() [4]IkeIntegrity {
+	return [4]IkeIntegrity{MD5, SHA1, SHA256, SHA384}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -463,6 +618,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IpsecEncryption enumerates the values for ipsec encryption.
 type IpsecEncryption string
 
@@ -487,6 +647,11 @@ const (
 	IpsecEncryptionNone IpsecEncryption = "None"
 )
 
+// PossibleIpsecEncryptionValues returns an array of possible values for the IpsecEncryption const type.
+func PossibleIpsecEncryptionValues() [9]IpsecEncryption {
+	return [9]IpsecEncryption{IpsecEncryptionAES128, IpsecEncryptionAES192, IpsecEncryptionAES256, IpsecEncryptionDES, IpsecEncryptionDES3, IpsecEncryptionGCMAES128, IpsecEncryptionGCMAES192, IpsecEncryptionGCMAES256, IpsecEncryptionNone}
+}
+
 // IpsecIntegrity enumerates the values for ipsec integrity.
 type IpsecIntegrity string
 
@@ -505,6 +670,11 @@ const (
 	IpsecIntegritySHA256 IpsecIntegrity = "SHA256"
 )
 
+// PossibleIpsecIntegrityValues returns an array of possible values for the IpsecIntegrity const type.
+func PossibleIpsecIntegrityValues() [6]IpsecIntegrity {
+	return [6]IpsecIntegrity{IpsecIntegrityGCMAES128, IpsecIntegrityGCMAES192, IpsecIntegrityGCMAES256, IpsecIntegrityMD5, IpsecIntegritySHA1, IpsecIntegritySHA256}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -515,6 +685,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // IssueType enumerates the values for issue type.
 type IssueType string
 
@@ -539,6 +714,11 @@ const (
 	IssueTypeUserDefinedRoute IssueType = "UserDefinedRoute"
 )
 
+// PossibleIssueTypeValues returns an array of possible values for the IssueType const type.
+func PossibleIssueTypeValues() [9]IssueType {
+	return [9]IssueType{IssueTypeAgentStopped, IssueTypeDNSResolution, IssueTypeGuestFirewall, IssueTypeNetworkSecurityRule, IssueTypePlatform, IssueTypePortThrottled, IssueTypeSocketBind, IssueTypeUnknown, IssueTypeUserDefinedRoute}
+}
+
 // LoadBalancerSkuName enumerates the values for load balancer sku name.
 type LoadBalancerSkuName string
 
@@ -549,6 +729,11 @@ const (
 	LoadBalancerSkuNameStandard LoadBalancerSkuName = "Standard"
 )
 
+// PossibleLoadBalancerSkuNameValues returns an array of possible values for the LoadBalancerSkuName const type.
+func PossibleLoadBalancerSkuNameValues() [2]LoadBalancerSkuName {
+	return [2]LoadBalancerSkuName{LoadBalancerSkuNameBasic, LoadBalancerSkuNameStandard}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -561,6 +746,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // NextHopType enumerates the values for next hop type.
 type NextHopType string
 
@@ -579,6 +769,11 @@ const (
 	NextHopTypeVnetLocal NextHopType = "VnetLocal"
 )
 
+// PossibleNextHopTypeValues returns an array of possible values for the NextHopType const type.
+func PossibleNextHopTypeValues() [6]NextHopType {
+	return [6]NextHopType{NextHopTypeHyperNetGateway, NextHopTypeInternet, NextHopTypeNone, NextHopTypeVirtualAppliance, NextHopTypeVirtualNetworkGateway, NextHopTypeVnetLocal}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -591,6 +786,11 @@ const (
 	Succeeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{Failed, InProgress, Succeeded}
+}
+
 // Origin enumerates the values for origin.
 type Origin string
 
@@ -603,6 +803,11 @@ const (
 	OriginOutbound Origin = "Outbound"
 )
 
+// PossibleOriginValues returns an array of possible values for the Origin const type.
+func PossibleOriginValues() [3]Origin {
+	return [3]Origin{OriginInbound, OriginLocal, OriginOutbound}
+}
+
 // PcError enumerates the values for pc error.
 type PcError string
 
@@ -619,6 +824,11 @@ const (
 	StorageFailed PcError = "StorageFailed"
 )
 
+// PossiblePcErrorValues returns an array of possible values for the PcError const type.
+func PossiblePcErrorValues() [5]PcError {
+	return [5]PcError{AgentStopped, CaptureFailed, InternalError, LocalFileFailed, StorageFailed}
+}
+
 // PcProtocol enumerates the values for pc protocol.
 type PcProtocol string
 
@@ -631,6 +841,11 @@ const (
 	PcProtocolUDP PcProtocol = "UDP"
 )
 
+// PossiblePcProtocolValues returns an array of possible values for the PcProtocol const type.
+func PossiblePcProtocolValues() [3]PcProtocol {
+	return [3]PcProtocol{PcProtocolAny, PcProtocolTCP, PcProtocolUDP}
+}
+
 // PcStatus enumerates the values for pc status.
 type PcStatus string
 
@@ -647,6 +862,11 @@ const (
 	PcStatusUnknown PcStatus = "Unknown"
 )
 
+// PossiblePcStatusValues returns an array of possible values for the PcStatus const type.
+func PossiblePcStatusValues() [5]PcStatus {
+	return [5]PcStatus{PcStatusError, PcStatusNotStarted, PcStatusRunning, PcStatusStopped, PcStatusUnknown}
+}
+
 // PfsGroup enumerates the values for pfs group.
 type PfsGroup string
 
@@ -667,6 +887,11 @@ const (
 	PfsGroupPFS24 PfsGroup = "PFS24"
 )
 
+// PossiblePfsGroupValues returns an array of possible values for the PfsGroup const type.
+func PossiblePfsGroupValues() [7]PfsGroup {
+	return [7]PfsGroup{PfsGroupECP256, PfsGroupECP384, PfsGroupNone, PfsGroupPFS1, PfsGroupPFS2, PfsGroupPFS2048, PfsGroupPFS24}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -677,6 +902,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -687,6 +917,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // Protocol enumerates the values for protocol.
 type Protocol string
 
@@ -697,6 +932,11 @@ const (
 	ProtocolUDP Protocol = "UDP"
 )
 
+// PossibleProtocolValues returns an array of possible values for the Protocol const type.
+func PossibleProtocolValues() [2]Protocol {
+	return [2]Protocol{ProtocolTCP, ProtocolUDP}
+}
+
 // ProvisioningState enumerates the values for provisioning state.
 type ProvisioningState string
 
@@ -711,6 +951,11 @@ const (
 	ProvisioningStateUpdating ProvisioningState = "Updating"
 )
 
+// PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type.
+func PossibleProvisioningStateValues() [4]ProvisioningState {
+	return [4]ProvisioningState{ProvisioningStateDeleting, ProvisioningStateFailed, ProvisioningStateSucceeded, ProvisioningStateUpdating}
+}
+
 // PublicIPAddressSkuName enumerates the values for public ip address sku name.
 type PublicIPAddressSkuName string
 
@@ -721,6 +966,11 @@ const (
 	PublicIPAddressSkuNameStandard PublicIPAddressSkuName = "Standard"
 )
 
+// PossiblePublicIPAddressSkuNameValues returns an array of possible values for the PublicIPAddressSkuName const type.
+func PossiblePublicIPAddressSkuNameValues() [2]PublicIPAddressSkuName {
+	return [2]PublicIPAddressSkuName{PublicIPAddressSkuNameBasic, PublicIPAddressSkuNameStandard}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -737,6 +987,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -747,6 +1002,11 @@ const (
 	SecurityRuleAccessDeny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{SecurityRuleAccessAllow, SecurityRuleAccessDeny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -757,6 +1017,11 @@ const (
 	SecurityRuleDirectionOutbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{SecurityRuleDirectionInbound, SecurityRuleDirectionOutbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -769,6 +1034,11 @@ const (
 	SecurityRuleProtocolUDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{SecurityRuleProtocolAsterisk, SecurityRuleProtocolTCP, SecurityRuleProtocolUDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -783,6 +1053,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // Severity enumerates the values for severity.
 type Severity string
 
@@ -793,6 +1068,11 @@ const (
 	SeverityWarning Severity = "Warning"
 )
 
+// PossibleSeverityValues returns an array of possible values for the Severity const type.
+func PossibleSeverityValues() [2]Severity {
+	return [2]Severity{SeverityError, SeverityWarning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -805,6 +1085,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [3]TransportProtocol {
+	return [3]TransportProtocol{TransportProtocolAll, TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -819,6 +1104,11 @@ const (
 	VirtualNetworkGatewayConnectionStatusUnknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{VirtualNetworkGatewayConnectionStatusConnected, VirtualNetworkGatewayConnectionStatusConnecting, VirtualNetworkGatewayConnectionStatusNotConnected, VirtualNetworkGatewayConnectionStatusUnknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -833,6 +1123,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -853,6 +1148,11 @@ const (
 	VirtualNetworkGatewaySkuNameVpnGw3 VirtualNetworkGatewaySkuName = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [7]VirtualNetworkGatewaySkuName {
+	return [7]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance, VirtualNetworkGatewaySkuNameVpnGw1, VirtualNetworkGatewaySkuNameVpnGw2, VirtualNetworkGatewaySkuNameVpnGw3}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -873,6 +1173,11 @@ const (
 	VirtualNetworkGatewaySkuTierVpnGw3 VirtualNetworkGatewaySkuTier = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [7]VirtualNetworkGatewaySkuTier {
+	return [7]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance, VirtualNetworkGatewaySkuTierVpnGw1, VirtualNetworkGatewaySkuTierVpnGw2, VirtualNetworkGatewaySkuTierVpnGw3}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -883,6 +1188,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -895,6 +1205,11 @@ const (
 	Initiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{Connected, Disconnected, Initiated}
+}
+
 // VpnClientProtocol enumerates the values for vpn client protocol.
 type VpnClientProtocol string
 
@@ -905,6 +1220,11 @@ const (
 	SSTP VpnClientProtocol = "SSTP"
 )
 
+// PossibleVpnClientProtocolValues returns an array of possible values for the VpnClientProtocol const type.
+func PossibleVpnClientProtocolValues() [2]VpnClientProtocol {
+	return [2]VpnClientProtocol{IkeV2, SSTP}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -915,6 +1235,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
@@ -2606,29 +2931,29 @@ type ApplicationGatewayRequestRoutingRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// ApplicationGatewaysBackendHealthFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupBackendHealthFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysBackendHealthFuture struct {
+type ApplicationGatewaysGroupBackendHealthFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGatewaysClient) (agbh ApplicationGatewayBackendHealth, err error) {
+func (future ApplicationGatewaysGroupBackendHealthFuture) Result(client ApplicationGatewaysGroupClient) (agbh ApplicationGatewayBackendHealth, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysBackendHealthFuture")
+		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupBackendHealthFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		agbh, err = client.BackendHealthResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2645,39 +2970,39 @@ func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGa
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	agbh, err = client.BackendHealthResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysCreateOrUpdateFuture struct {
+type ApplicationGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) {
+func (future ApplicationGatewaysGroupCreateOrUpdateFuture) Result(client ApplicationGatewaysGroupClient) (ag ApplicationGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysCreateOrUpdateFuture")
+		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ag, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2694,39 +3019,39 @@ func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationG
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ag, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ApplicationGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ApplicationGatewaysDeleteFuture struct {
+type ApplicationGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
+func (future ApplicationGatewaysGroupDeleteFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2743,12 +3068,159 @@ func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStartFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStartFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStartFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStartFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StartResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StartResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStopFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStopFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStopFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StopResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StopResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type ApplicationGatewaysGroupUpdateTagsFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupUpdateTagsFuture) Result(client ApplicationGatewaysGroupClient) (ag ApplicationGateway, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupUpdateTagsFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ag, err = client.UpdateTagsResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ag, err = client.UpdateTagsResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -2902,171 +3374,24 @@ func (agspp *ApplicationGatewaySslPredefinedPolicy) UnmarshalJSON(body []byte) e
 		case "id":
 			if v != nil {
 				var ID string
-				err = json.Unmarshal(*v, &ID)
-				if err != nil {
-					return err
-				}
-				agspp.ID = &ID
-			}
-		}
-	}
-
-	return nil
-}
-
-// ApplicationGatewaySslPredefinedPolicyPropertiesFormat properties of ApplicationGatewaySslPredefinedPolicy
-type ApplicationGatewaySslPredefinedPolicyPropertiesFormat struct {
-	// CipherSuites - Ssl cipher suites to be enabled in the specified order for application gateway.
-	CipherSuites *[]ApplicationGatewaySslCipherSuite `json:"cipherSuites,omitempty"`
-	// MinProtocolVersion - Minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv10', 'TLSv11', 'TLSv12'
-	MinProtocolVersion ApplicationGatewaySslProtocol `json:"minProtocolVersion,omitempty"`
-}
-
-// ApplicationGatewaysStartFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStartFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStartFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StartResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StartResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
-// ApplicationGatewaysStopFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStopFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStopFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StopResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StopResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure responding to request")
+				err = json.Unmarshal(*v, &ID)
+				if err != nil {
+					return err
+				}
+				agspp.ID = &ID
+			}
+		}
 	}
-	return
-}
 
-// ApplicationGatewaysUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysUpdateTagsFuture struct {
-	azure.Future
-	req *http.Request
+	return nil
 }
 
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysUpdateTagsFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysUpdateTagsFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ag, err = client.UpdateTagsResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ag, err = client.UpdateTagsResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request")
-	}
-	return
+// ApplicationGatewaySslPredefinedPolicyPropertiesFormat properties of ApplicationGatewaySslPredefinedPolicy
+type ApplicationGatewaySslPredefinedPolicyPropertiesFormat struct {
+	// CipherSuites - Ssl cipher suites to be enabled in the specified order for application gateway.
+	CipherSuites *[]ApplicationGatewaySslCipherSuite `json:"cipherSuites,omitempty"`
+	// MinProtocolVersion - Minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv10', 'TLSv11', 'TLSv12'
+	MinProtocolVersion ApplicationGatewaySslProtocol `json:"minProtocolVersion,omitempty"`
 }
 
 // ApplicationGatewayURLPathMap urlPathMaps give a url path to the backend mapping information for
@@ -3407,29 +3732,29 @@ type ApplicationSecurityGroupPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// ApplicationSecurityGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationSecurityGroupsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationSecurityGroupsCreateOrUpdateFuture struct {
+type ApplicationSecurityGroupsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client ApplicationSecurityGroupsClient) (asg ApplicationSecurityGroup, err error) {
+func (future ApplicationSecurityGroupsGroupCreateOrUpdateFuture) Result(client ApplicationSecurityGroupsGroupClient) (asg ApplicationSecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return asg, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsCreateOrUpdateFuture")
+		return asg, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		asg, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3446,39 +3771,39 @@ func (future ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client Applic
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	asg, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationSecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationSecurityGroupsDeleteFuture struct {
+// ApplicationSecurityGroupsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type ApplicationSecurityGroupsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationSecurityGroupsDeleteFuture) Result(client ApplicationSecurityGroupsClient) (ar autorest.Response, err error) {
+func (future ApplicationSecurityGroupsGroupDeleteFuture) Result(client ApplicationSecurityGroupsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3495,12 +3820,12 @@ func (future ApplicationSecurityGroupsDeleteFuture) Result(client ApplicationSec
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -4641,29 +4966,29 @@ func (erca *ExpressRouteCircuitAuthorization) UnmarshalJSON(body []byte) error {
 	return nil
 }
 
-// ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results
-// of a long-running operation.
-type ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (erca ExpressRouteCircuitAuthorization, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (erca ExpressRouteCircuitAuthorization, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture")
+		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erca, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4680,39 +5005,39 @@ func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(clien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erca, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitAuthorizationsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitAuthorizationsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitAuthorizationsDeleteFuture struct {
+type ExpressRouteCircuitAuthorizationsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4729,12 +5054,12 @@ func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client Expres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -5062,29 +5387,29 @@ type ExpressRouteCircuitPeeringPropertiesFormat struct {
 	Ipv6PeeringConfig *Ipv6ExpressRouteCircuitPeeringConfig `json:"ipv6PeeringConfig,omitempty"`
 }
 
-// ExpressRouteCircuitPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitPeeringsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsClient) (ercp ExpressRouteCircuitPeering, err error) {
+func (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ercp ExpressRouteCircuitPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture")
+		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5101,39 +5426,39 @@ func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client Expr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitPeeringsDeleteFuture struct {
+type ExpressRouteCircuitPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRouteCircuitPeeringsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitPeeringsGroupDeleteFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5150,12 +5475,12 @@ func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRoute
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -5221,29 +5546,39 @@ type ExpressRouteCircuitsArpTableListResult struct {
 	NextLink *string `json:"nextLink,omitempty"`
 }
 
-// ExpressRouteCircuitsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
+type ExpressRouteCircuitServiceProviderProperties struct {
+	// ServiceProviderName - The serviceProviderName.
+	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
+	// PeeringLocation - The peering location.
+	PeeringLocation *string `json:"peeringLocation,omitempty"`
+	// BandwidthInMbps - The BandwidthInMbps.
+	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
+}
+
+// ExpressRouteCircuitsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsCreateOrUpdateFuture struct {
+type ExpressRouteCircuitsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) {
+func (future ExpressRouteCircuitsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitsGroupClient) (erc ExpressRouteCircuit, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsCreateOrUpdateFuture")
+		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5260,39 +5595,39 @@ func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRout
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ExpressRouteCircuitsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ExpressRouteCircuitsDeleteFuture struct {
+type ExpressRouteCircuitsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuitsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitsGroupDeleteFuture) Result(client ExpressRouteCircuitsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5309,59 +5644,39 @@ func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuit
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
-type ExpressRouteCircuitServiceProviderProperties struct {
-	// ServiceProviderName - The serviceProviderName.
-	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
-	// PeeringLocation - The peering location.
-	PeeringLocation *string `json:"peeringLocation,omitempty"`
-	// BandwidthInMbps - The BandwidthInMbps.
-	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
-}
-
-// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
-type ExpressRouteCircuitSku struct {
-	// Name - The name of the SKU.
-	Name *string `json:"name,omitempty"`
-	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
-	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
-	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
-	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
-}
-
-// ExpressRouteCircuitsListArpTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListArpTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListArpTableFuture struct {
+type ExpressRouteCircuitsGroupListArpTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteCircuitsClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListArpTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListArpTableFuture")
+		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListArpTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercatlr, err = client.ListArpTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5378,39 +5693,39 @@ func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercatlr, err = client.ListArpTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListRoutesTableFuture struct {
+type ExpressRouteCircuitsGroupListRoutesTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRouteCircuitsClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableFuture")
+		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtlr, err = client.ListRoutesTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5427,39 +5742,39 @@ func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtlr, err = client.ListRoutesTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitsListRoutesTableSummaryFuture struct {
+// ExpressRouteCircuitsGroupListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type ExpressRouteCircuitsGroupListRoutesTableSummaryFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableSummaryFuture")
+		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtslr, err = client.ListRoutesTableSummaryResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5476,72 +5791,39 @@ func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client Exp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtslr, err = client.ListRoutesTableSummaryResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsRoutesTableListResult response for ListRoutesTable associated with the Express Route
-// Circuits API.
-type ExpressRouteCircuitsRoutesTableListResult struct {
-	autorest.Response `json:"-"`
-	// Value - The list of routes table.
-	Value *[]ExpressRouteCircuitRoutesTable `json:"value,omitempty"`
-	// NextLink - The URL to get the next set of results.
-	NextLink *string `json:"nextLink,omitempty"`
-}
-
-// ExpressRouteCircuitsRoutesTableSummaryListResult response for ListRoutesTable associated with the Express Route
-// Circuits API.
-type ExpressRouteCircuitsRoutesTableSummaryListResult struct {
-	autorest.Response `json:"-"`
-	// Value - A list of the routes table.
-	Value *[]ExpressRouteCircuitRoutesTableSummary `json:"value,omitempty"`
-	// NextLink - The URL to get the next set of results.
-	NextLink *string `json:"nextLink,omitempty"`
-}
-
-// ExpressRouteCircuitStats contains stats associated with the peering.
-type ExpressRouteCircuitStats struct {
-	autorest.Response `json:"-"`
-	// PrimarybytesIn - Gets BytesIn of the peering.
-	PrimarybytesIn *int64 `json:"primarybytesIn,omitempty"`
-	// PrimarybytesOut - Gets BytesOut of the peering.
-	PrimarybytesOut *int64 `json:"primarybytesOut,omitempty"`
-	// SecondarybytesIn - Gets BytesIn of the peering.
-	SecondarybytesIn *int64 `json:"secondarybytesIn,omitempty"`
-	// SecondarybytesOut - Gets BytesOut of the peering.
-	SecondarybytesOut *int64 `json:"secondarybytesOut,omitempty"`
-}
-
-// ExpressRouteCircuitsUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ExpressRouteCircuitsUpdateTagsFuture struct {
+// ExpressRouteCircuitsGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type ExpressRouteCircuitsGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsUpdateTagsFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) {
+func (future ExpressRouteCircuitsGroupUpdateTagsFuture) Result(client ExpressRouteCircuitsGroupClient) (erc ExpressRouteCircuit, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsUpdateTagsFuture")
+		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erc, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5558,16 +5840,59 @@ func (future ExpressRouteCircuitsUpdateTagsFuture) Result(client ExpressRouteCir
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erc, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
+type ExpressRouteCircuitSku struct {
+	// Name - The name of the SKU.
+	Name *string `json:"name,omitempty"`
+	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
+	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
+	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
+	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
+}
+
+// ExpressRouteCircuitsRoutesTableListResult response for ListRoutesTable associated with the Express Route
+// Circuits API.
+type ExpressRouteCircuitsRoutesTableListResult struct {
+	autorest.Response `json:"-"`
+	// Value - The list of routes table.
+	Value *[]ExpressRouteCircuitRoutesTable `json:"value,omitempty"`
+	// NextLink - The URL to get the next set of results.
+	NextLink *string `json:"nextLink,omitempty"`
+}
+
+// ExpressRouteCircuitsRoutesTableSummaryListResult response for ListRoutesTable associated with the Express Route
+// Circuits API.
+type ExpressRouteCircuitsRoutesTableSummaryListResult struct {
+	autorest.Response `json:"-"`
+	// Value - A list of the routes table.
+	Value *[]ExpressRouteCircuitRoutesTableSummary `json:"value,omitempty"`
+	// NextLink - The URL to get the next set of results.
+	NextLink *string `json:"nextLink,omitempty"`
+}
+
+// ExpressRouteCircuitStats contains stats associated with the peering.
+type ExpressRouteCircuitStats struct {
+	autorest.Response `json:"-"`
+	// PrimarybytesIn - Gets BytesIn of the peering.
+	PrimarybytesIn *int64 `json:"primarybytesIn,omitempty"`
+	// PrimarybytesOut - Gets BytesOut of the peering.
+	PrimarybytesOut *int64 `json:"primarybytesOut,omitempty"`
+	// SecondarybytesIn - Gets BytesIn of the peering.
+	SecondarybytesIn *int64 `json:"secondarybytesIn,omitempty"`
+	// SecondarybytesOut - Gets BytesOut of the peering.
+	SecondarybytesOut *int64 `json:"secondarybytesOut,omitempty"`
+}
+
 // ExpressRouteServiceProvider a ExpressRouteResourceProvider object.
 type ExpressRouteServiceProvider struct {
 	*ExpressRouteServiceProviderPropertiesFormat `json:"properties,omitempty"`
@@ -6241,29 +6566,29 @@ type InboundNatRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InboundNatRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type InboundNatRulesCreateOrUpdateFuture struct {
+// InboundNatRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type InboundNatRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesClient) (inr InboundNatRule, err error) {
+func (future InboundNatRulesGroupCreateOrUpdateFuture) Result(client InboundNatRulesGroupClient) (inr InboundNatRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesCreateOrUpdateFuture")
+		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		inr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6280,39 +6605,39 @@ func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	inr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InboundNatRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// InboundNatRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InboundNatRulesDeleteFuture struct {
+type InboundNatRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (ar autorest.Response, err error) {
+func (future InboundNatRulesGroupDeleteFuture) Result(client InboundNatRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6329,12 +6654,12 @@ func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -6906,29 +7231,29 @@ type InterfacePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InterfacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// InterfacesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InterfacesCreateOrUpdateFuture struct {
+type InterfacesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i Interface, err error) {
+func (future InterfacesGroupCreateOrUpdateFuture) Result(client InterfacesGroupClient) (i Interface, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return i, azure.NewAsyncOpIncompleteError("network.InterfacesCreateOrUpdateFuture")
+		return i, azure.NewAsyncOpIncompleteError("network.InterfacesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		i, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6945,38 +7270,39 @@ func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	i, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type InterfacesDeleteFuture struct {
+// InterfacesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type InterfacesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autorest.Response, err error) {
+func (future InterfacesGroupDeleteFuture) Result(client InterfacesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6993,39 +7319,39 @@ func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autores
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
+// InterfacesGroupGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type InterfacesGetEffectiveRouteTableFuture struct {
+type InterfacesGroupGetEffectiveRouteTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesClient) (erlr EffectiveRouteListResult, err error) {
+func (future InterfacesGroupGetEffectiveRouteTableFuture) Result(client InterfacesGroupClient) (erlr EffectiveRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGetEffectiveRouteTableFuture")
+		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupGetEffectiveRouteTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erlr, err = client.GetEffectiveRouteTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7042,39 +7368,39 @@ func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erlr, err = client.GetEffectiveRouteTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type InterfacesListEffectiveNetworkSecurityGroupsFuture struct {
+// InterfacesGroupListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type InterfacesGroupListEffectiveNetworkSecurityGroupsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
+func (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesGroupClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesListEffectiveNetworkSecurityGroupsFuture")
+		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7091,38 +7417,39 @@ func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client I
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type InterfacesUpdateTagsFuture struct {
+// InterfacesGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type InterfacesGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesUpdateTagsFuture) Result(client InterfacesClient) (i Interface, err error) {
+func (future InterfacesGroupUpdateTagsFuture) Result(client InterfacesGroupClient) (i Interface, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return i, azure.NewAsyncOpIncompleteError("network.InterfacesUpdateTagsFuture")
+		return i, azure.NewAsyncOpIncompleteError("network.InterfacesGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		i, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7139,12 +7466,12 @@ func (future InterfacesUpdateTagsFuture) Result(client InterfacesClient) (i Inte
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	i, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -7942,29 +8269,29 @@ type LoadBalancerPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LoadBalancersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type LoadBalancersCreateOrUpdateFuture struct {
+// LoadBalancersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type LoadBalancersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) {
+func (future LoadBalancersGroupCreateOrUpdateFuture) Result(client LoadBalancersGroupClient) (lb LoadBalancer, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersCreateOrUpdateFuture")
+		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lb, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7981,38 +8308,39 @@ func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lb, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LoadBalancersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type LoadBalancersDeleteFuture struct {
+// LoadBalancersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type LoadBalancersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar autorest.Response, err error) {
+func (future LoadBalancersGroupDeleteFuture) Result(client LoadBalancersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8029,45 +8357,39 @@ func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LoadBalancerSku SKU of a load balancer
-type LoadBalancerSku struct {
-	// Name - Name of a load balancer SKU. Possible values include: 'LoadBalancerSkuNameBasic', 'LoadBalancerSkuNameStandard'
-	Name LoadBalancerSkuName `json:"name,omitempty"`
-}
-
-// LoadBalancersUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// LoadBalancersGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type LoadBalancersUpdateTagsFuture struct {
+type LoadBalancersGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersUpdateTagsFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) {
+func (future LoadBalancersGroupUpdateTagsFuture) Result(client LoadBalancersGroupClient) (lb LoadBalancer, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersUpdateTagsFuture")
+		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lb, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8084,16 +8406,22 @@ func (future LoadBalancersUpdateTagsFuture) Result(client LoadBalancersClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lb, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// LoadBalancerSku SKU of a load balancer
+type LoadBalancerSku struct {
+	// Name - Name of a load balancer SKU. Possible values include: 'LoadBalancerSkuNameBasic', 'LoadBalancerSkuNameStandard'
+	Name LoadBalancerSkuName `json:"name,omitempty"`
+}
+
 // LoadBalancingRule a load balancing rule for a load balancer.
 type LoadBalancingRule struct {
 	autorest.Response `json:"-"`
@@ -8424,29 +8752,29 @@ type LocalNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LocalNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// LocalNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type LocalNetworkGatewaysCreateOrUpdateFuture struct {
+type LocalNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) {
+func (future LocalNetworkGatewaysGroupCreateOrUpdateFuture) Result(client LocalNetworkGatewaysGroupClient) (lng LocalNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysCreateOrUpdateFuture")
+		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8463,39 +8791,39 @@ func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetwor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LocalNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// LocalNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type LocalNetworkGatewaysDeleteFuture struct {
+type LocalNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future LocalNetworkGatewaysGroupDeleteFuture) Result(client LocalNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8512,39 +8840,39 @@ func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGateway
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LocalNetworkGatewaysUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type LocalNetworkGatewaysUpdateTagsFuture struct {
+// LocalNetworkGatewaysGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type LocalNetworkGatewaysGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysUpdateTagsFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) {
+func (future LocalNetworkGatewaysGroupUpdateTagsFuture) Result(client LocalNetworkGatewaysGroupClient) (lng LocalNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysUpdateTagsFuture")
+		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lng, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8561,12 +8889,12 @@ func (future LocalNetworkGatewaysUpdateTagsFuture) Result(client LocalNetworkGat
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lng, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -9062,28 +9390,29 @@ type PacketCaptureResultProperties struct {
 	Filters            *[]PacketCaptureFilter        `json:"filters,omitempty"`
 }
 
-// PacketCapturesCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesCreateFuture struct {
+// PacketCapturesGroupCreateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupCreateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pcr PacketCaptureResult, err error) {
+func (future PacketCapturesGroupCreateFuture) Result(client PacketCapturesGroupClient) (pcr PacketCaptureResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesCreateFuture")
+		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupCreateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcr, err = client.CreateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9100,38 +9429,39 @@ func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pc
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcr, err = client.CreateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesDeleteFuture struct {
+// PacketCapturesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupDeleteFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9148,39 +9478,39 @@ func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// PacketCapturesGroupGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PacketCapturesGetStatusFuture struct {
+type PacketCapturesGroupGetStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
+func (future PacketCapturesGroupGetStatusFuture) Result(client PacketCapturesGroupClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGetStatusFuture")
+		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupGetStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcqsr, err = client.GetStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9197,38 +9527,39 @@ func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcqsr, err = client.GetStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesStopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesStopFuture struct {
+// PacketCapturesGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupStopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupStopFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesStopFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupStopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9245,12 +9576,12 @@ func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -9711,29 +10042,29 @@ type PublicIPAddressDNSSettings struct {
 	ReverseFqdn *string `json:"reverseFqdn,omitempty"`
 }
 
-// PublicIPAddressesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type PublicIPAddressesCreateOrUpdateFuture struct {
+// PublicIPAddressesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type PublicIPAddressesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) {
+func (future PublicIPAddressesGroupCreateOrUpdateFuture) Result(client PublicIPAddressesGroupClient) (pia PublicIPAddress, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesCreateOrUpdateFuture")
+		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pia, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9750,39 +10081,39 @@ func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pia, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PublicIPAddressesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// PublicIPAddressesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PublicIPAddressesDeleteFuture struct {
+type PublicIPAddressesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClient) (ar autorest.Response, err error) {
+func (future PublicIPAddressesGroupDeleteFuture) Result(client PublicIPAddressesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9799,39 +10130,39 @@ func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PublicIPAddressesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type PublicIPAddressesUpdateTagsFuture struct {
+// PublicIPAddressesGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type PublicIPAddressesGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesUpdateTagsFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) {
+func (future PublicIPAddressesGroupUpdateTagsFuture) Result(client PublicIPAddressesGroupClient) (pia PublicIPAddress, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesUpdateTagsFuture")
+		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pia, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9848,12 +10179,12 @@ func (future PublicIPAddressesUpdateTagsFuture) Result(client PublicIPAddressesC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pia, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10630,29 +10961,29 @@ type RouteFilterRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteFilterRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type RouteFilterRulesCreateOrUpdateFuture struct {
+// RouteFilterRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type RouteFilterRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupCreateOrUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesCreateOrUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10669,39 +11000,39 @@ func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRule
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesDeleteFuture struct {
+type RouteFilterRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) (ar autorest.Response, err error) {
+func (future RouteFilterRulesGroupDeleteFuture) Result(client RouteFilterRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10718,39 +11049,39 @@ func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesUpdateFuture struct {
+type RouteFilterRulesGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10767,39 +11098,39 @@ func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFiltersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFiltersCreateOrUpdateFuture struct {
+type RouteFiltersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupCreateOrUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersCreateOrUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10816,38 +11147,39 @@ func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersDeleteFuture struct {
+// RouteFiltersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar autorest.Response, err error) {
+func (future RouteFiltersGroupDeleteFuture) Result(client RouteFiltersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10864,38 +11196,39 @@ func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar aut
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersUpdateFuture struct {
+// RouteFiltersGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10912,12 +11245,12 @@ func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf Rou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11036,28 +11369,29 @@ type RoutePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RoutesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesCreateOrUpdateFuture struct {
+// RoutesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RoutesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, err error) {
+func (future RoutesGroupCreateOrUpdateFuture) Result(client RoutesGroupClient) (r Route, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return r, azure.NewAsyncOpIncompleteError("network.RoutesCreateOrUpdateFuture")
+		return r, azure.NewAsyncOpIncompleteError("network.RoutesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		r, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11074,38 +11408,38 @@ func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, e
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	r, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RoutesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesDeleteFuture struct {
+// RoutesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type RoutesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Response, err error) {
+func (future RoutesGroupDeleteFuture) Result(client RoutesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RoutesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RoutesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11122,12 +11456,12 @@ func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Respon
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11368,29 +11702,29 @@ type RouteTablePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteTablesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteTablesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteTablesCreateOrUpdateFuture struct {
+type RouteTablesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (rt RouteTable, err error) {
+func (future RouteTablesGroupCreateOrUpdateFuture) Result(client RouteTablesGroupClient) (rt RouteTable, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesCreateOrUpdateFuture")
+		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rt, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11407,38 +11741,39 @@ func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rt, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteTablesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteTablesDeleteFuture struct {
+// RouteTablesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteTablesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autorest.Response, err error) {
+func (future RouteTablesGroupDeleteFuture) Result(client RouteTablesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11455,39 +11790,39 @@ func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteTablesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteTablesGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteTablesUpdateTagsFuture struct {
+type RouteTablesGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesUpdateTagsFuture) Result(client RouteTablesClient) (rt RouteTable, err error) {
+func (future RouteTablesGroupUpdateTagsFuture) Result(client RouteTablesGroupClient) (rt RouteTable, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesUpdateTagsFuture")
+		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rt, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11504,12 +11839,12 @@ func (future RouteTablesUpdateTagsFuture) Result(client RouteTablesClient) (rt R
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rt, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11763,29 +12098,29 @@ type SecurityGroupPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityGroupsCreateOrUpdateFuture struct {
+// SecurityGroupsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityGroupsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) {
+func (future SecurityGroupsGroupCreateOrUpdateFuture) Result(client SecurityGroupsGroupClient) (sg SecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsCreateOrUpdateFuture")
+		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sg, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11802,38 +12137,39 @@ func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sg, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityGroupsDeleteFuture struct {
+// SecurityGroupsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityGroupsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar autorest.Response, err error) {
+func (future SecurityGroupsGroupDeleteFuture) Result(client SecurityGroupsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11850,39 +12186,39 @@ func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityGroupsUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// SecurityGroupsGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type SecurityGroupsUpdateTagsFuture struct {
+type SecurityGroupsGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsUpdateTagsFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) {
+func (future SecurityGroupsGroupUpdateTagsFuture) Result(client SecurityGroupsGroupClient) (sg SecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsUpdateTagsFuture")
+		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sg, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11899,12 +12235,12 @@ func (future SecurityGroupsUpdateTagsFuture) Result(client SecurityGroupsClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sg, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12135,29 +12471,29 @@ type SecurityRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityRulesCreateOrUpdateFuture struct {
+// SecurityRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClient) (sr SecurityRule, err error) {
+func (future SecurityRulesGroupCreateOrUpdateFuture) Result(client SecurityRulesGroupClient) (sr SecurityRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesCreateOrUpdateFuture")
+		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12174,38 +12510,39 @@ func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityRulesDeleteFuture struct {
+// SecurityRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar autorest.Response, err error) {
+func (future SecurityRulesGroupDeleteFuture) Result(client SecurityRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12222,12 +12559,12 @@ func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12440,29 +12777,29 @@ type SubnetPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SubnetsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// SubnetsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type SubnetsCreateOrUpdateFuture struct {
+type SubnetsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet, err error) {
+func (future SubnetsGroupCreateOrUpdateFuture) Result(client SubnetsGroupClient) (s Subnet, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.SubnetsCreateOrUpdateFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.SubnetsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12479,38 +12816,38 @@ func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SubnetsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SubnetsDeleteFuture struct {
+// SubnetsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type SubnetsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Response, err error) {
+func (future SubnetsGroupDeleteFuture) Result(client SubnetsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12527,12 +12864,12 @@ func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Resp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -13533,29 +13870,29 @@ type VirtualNetworkGatewayConnectionPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewayConnectionsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsCreateOrUpdateFuture struct {
+// VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngc VirtualNetworkGatewayConnection, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (vngc VirtualNetworkGatewayConnection, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture")
+		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vngc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13572,39 +13909,39 @@ func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vngc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewayConnectionsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewayConnectionsDeleteFuture struct {
+type VirtualNetworkGatewayConnectionsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client VirtualNetworkGatewayConnectionsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupDeleteFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13621,39 +13958,39 @@ func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsResetSharedKeyFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsResetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (crsk ConnectionResetSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (crsk ConnectionResetSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture")
+		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		crsk, err = client.ResetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13670,39 +14007,39 @@ func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	crsk, err = client.ResetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsSetSharedKeyFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewayConnectionsSetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (csk ConnectionSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (csk ConnectionSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture")
+		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		csk, err = client.SetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13719,39 +14056,39 @@ func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client V
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	csk, err = client.SetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewayConnectionsUpdateTagsFuture struct {
+// VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsUpdateTagsFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngcle VirtualNetworkGatewayConnectionListEntity, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (vngcle VirtualNetworkGatewayConnectionListEntity, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vngcle, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsUpdateTagsFuture")
+		return vngcle, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vngcle, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13768,12 +14105,12 @@ func (future VirtualNetworkGatewayConnectionsUpdateTagsFuture) Result(client Vir
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vngcle, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -14086,29 +14423,29 @@ type VirtualNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysCreateOrUpdateFuture struct {
+type VirtualNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysCreateOrUpdateFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14125,39 +14462,39 @@ func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysDeleteFuture struct {
+// VirtualNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewaysGroupDeleteFuture) Result(client VirtualNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14174,39 +14511,39 @@ func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGat
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewaysGeneratevpnclientpackageFuture struct {
+// VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GeneratevpnclientpackageResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14223,39 +14560,39 @@ func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GeneratevpnclientpackageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGenerateVpnProfileFuture struct {
+// VirtualNetworkGatewaysGroupGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGenerateVpnProfileFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGenerateVpnProfileFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GenerateVpnProfileResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14272,39 +14609,39 @@ func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client Virtu
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GenerateVpnProfileResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGetAdvertisedRoutesFuture struct {
+// VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetAdvertisedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14321,39 +14658,39 @@ func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client Virt
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetAdvertisedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetBgpPeerStatusFuture struct {
+type VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysClient) (bpslr BgpPeerStatusListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysGroupClient) (bpslr BgpPeerStatusListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetBgpPeerStatusFuture")
+		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		bpslr, err = client.GetBgpPeerStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14370,39 +14707,39 @@ func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	bpslr, err = client.GetBgpPeerStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetLearnedRoutesFuture struct {
+type VirtualNetworkGatewaysGroupGetLearnedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetLearnedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetLearnedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14419,39 +14756,39 @@ func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetLearnedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetVpnProfilePackageURLFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewaysGetVpnProfilePackageURLFuture struct {
+// VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GetVpnProfilePackageURLResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14468,49 +14805,39 @@ func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GetVpnProfilePackageURLResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
-type VirtualNetworkGatewaySku struct {
-	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
-	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
-	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
-	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
-	// Capacity - The capacity.
-	Capacity *int32 `json:"capacity,omitempty"`
-}
-
-// VirtualNetworkGatewaysResetFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysResetFuture struct {
+// VirtualNetworkGatewaysGroupResetFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupResetFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupResetFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysResetFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupResetFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.ResetResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14527,39 +14854,39 @@ func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGate
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.ResetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysUpdateTagsFuture struct {
+type VirtualNetworkGatewaysGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysUpdateTagsFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupUpdateTagsFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysUpdateTagsFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14576,16 +14903,26 @@ func (future VirtualNetworkGatewaysUpdateTagsFuture) Result(client VirtualNetwor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
+type VirtualNetworkGatewaySku struct {
+	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
+	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
+	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
+	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
+	// Capacity - The capacity.
+	Capacity *int32 `json:"capacity,omitempty"`
+}
+
 // VirtualNetworkListResult response for the ListVirtualNetworks API service call.
 type VirtualNetworkListResult struct {
 	autorest.Response `json:"-"`
@@ -14977,29 +15314,29 @@ type VirtualNetworkPeeringPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkPeeringsCreateOrUpdateFuture struct {
+type VirtualNetworkPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsClient) (vnp VirtualNetworkPeering, err error) {
+func (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsGroupClient) (vnp VirtualNetworkPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsCreateOrUpdateFuture")
+		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vnp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15016,39 +15353,39 @@ func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vnp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkPeeringsDeleteFuture struct {
+// VirtualNetworkPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPeeringsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkPeeringsGroupDeleteFuture) Result(client VirtualNetworkPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15065,12 +15402,12 @@ func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPee
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -15095,29 +15432,29 @@ type VirtualNetworkPropertiesFormat struct {
 	EnableVMProtection *bool `json:"enableVmProtection,omitempty"`
 }
 
-// VirtualNetworksCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworksCreateOrUpdateFuture struct {
+// VirtualNetworksGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworksGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) {
+func (future VirtualNetworksGroupCreateOrUpdateFuture) Result(client VirtualNetworksGroupClient) (vn VirtualNetwork, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksCreateOrUpdateFuture")
+		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vn, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15134,39 +15471,39 @@ func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vn, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworksDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// VirtualNetworksGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type VirtualNetworksDeleteFuture struct {
+type VirtualNetworksGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (ar autorest.Response, err error) {
+func (future VirtualNetworksGroupDeleteFuture) Result(client VirtualNetworksGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15183,39 +15520,39 @@ func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworksUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// VirtualNetworksGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type VirtualNetworksUpdateTagsFuture struct {
+type VirtualNetworksGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksUpdateTagsFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) {
+func (future VirtualNetworksGroupUpdateTagsFuture) Result(client VirtualNetworksGroupClient) (vn VirtualNetwork, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksUpdateTagsFuture")
+		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vn, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15232,12 +15569,12 @@ func (future VirtualNetworksUpdateTagsFuture) Result(client VirtualNetworksClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vn, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -15580,29 +15917,29 @@ type WatcherPropertiesFormat struct {
 	ProvisioningState ProvisioningState `json:"provisioningState,omitempty"`
 }
 
-// WatchersCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersCheckConnectivityFuture struct {
+type WatchersGroupCheckConnectivityFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci ConnectivityInformation, err error) {
+func (future WatchersGroupCheckConnectivityFuture) Result(client WatchersGroupClient) (ci ConnectivityInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ci, azure.NewAsyncOpIncompleteError("network.WatchersCheckConnectivityFuture")
+		return ci, azure.NewAsyncOpIncompleteError("network.WatchersGroupCheckConnectivityFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ci, err = client.CheckConnectivityResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15619,38 +15956,38 @@ func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ci, err = client.CheckConnectivityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersDeleteFuture struct {
+// WatchersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type WatchersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Response, err error) {
+func (future WatchersGroupDeleteFuture) Result(client WatchersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.WatchersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.WatchersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15667,39 +16004,39 @@ func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Re
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetAzureReachabilityReportFuture an abstraction for monitoring and retrieving the results of a
+// WatchersGroupGetAzureReachabilityReportFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type WatchersGetAzureReachabilityReportFuture struct {
+type WatchersGroupGetAzureReachabilityReportFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetAzureReachabilityReportFuture) Result(client WatchersClient) (arr AzureReachabilityReport, err error) {
+func (future WatchersGroupGetAzureReachabilityReportFuture) Result(client WatchersGroupClient) (arr AzureReachabilityReport, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return arr, azure.NewAsyncOpIncompleteError("network.WatchersGetAzureReachabilityReportFuture")
+		return arr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetAzureReachabilityReportFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		arr, err = client.GetAzureReachabilityReportResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15716,39 +16053,39 @@ func (future WatchersGetAzureReachabilityReportFuture) Result(client WatchersCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	arr, err = client.GetAzureReachabilityReportResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetFlowLogStatusFuture struct {
+type WatchersGroupGetFlowLogStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupGetFlowLogStatusFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGetFlowLogStatusFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetFlowLogStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.GetFlowLogStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15765,38 +16102,39 @@ func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.GetFlowLogStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersGetNextHopFuture struct {
+// WatchersGroupGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupGetNextHopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHopResult, err error) {
+func (future WatchersGroupGetNextHopFuture) Result(client WatchersGroupClient) (nhr NextHopResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGetNextHopFuture")
+		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetNextHopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		nhr, err = client.GetNextHopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15813,39 +16151,39 @@ func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHo
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	nhr, err = client.GetNextHopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetTroubleshootingFuture struct {
+type WatchersGroupGetTroubleshootingFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15862,39 +16200,39 @@ func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
+// WatchersGroupGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type WatchersGetTroubleshootingResultFuture struct {
+type WatchersGroupGetTroubleshootingResultFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingResultFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingResultFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingResultFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResultResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15911,39 +16249,39 @@ func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResultResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetVMSecurityRulesFuture struct {
+type WatchersGroupGetVMSecurityRulesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sgvr SecurityGroupViewResult, err error) {
+func (future WatchersGroupGetVMSecurityRulesFuture) Result(client WatchersGroupClient) (sgvr SecurityGroupViewResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGetVMSecurityRulesFuture")
+		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetVMSecurityRulesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sgvr, err = client.GetVMSecurityRulesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15960,39 +16298,39 @@ func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sg
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sgvr, err = client.GetVMSecurityRulesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersListAvailableProvidersFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type WatchersListAvailableProvidersFuture struct {
+// WatchersGroupListAvailableProvidersFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type WatchersGroupListAvailableProvidersFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersListAvailableProvidersFuture) Result(client WatchersClient) (apl AvailableProvidersList, err error) {
+func (future WatchersGroupListAvailableProvidersFuture) Result(client WatchersGroupClient) (apl AvailableProvidersList, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return apl, azure.NewAsyncOpIncompleteError("network.WatchersListAvailableProvidersFuture")
+		return apl, azure.NewAsyncOpIncompleteError("network.WatchersGroupListAvailableProvidersFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		apl, err = client.ListAvailableProvidersResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16009,39 +16347,39 @@ func (future WatchersListAvailableProvidersFuture) Result(client WatchersClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	apl, err = client.ListAvailableProvidersResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type WatchersSetFlowLogConfigurationFuture struct {
+// WatchersGroupSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type WatchersGroupSetFlowLogConfigurationFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupSetFlowLogConfigurationFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersSetFlowLogConfigurationFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupSetFlowLogConfigurationFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.SetFlowLogConfigurationResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16058,38 +16396,39 @@ func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.SetFlowLogConfigurationResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersVerifyIPFlowFuture struct {
+// WatchersGroupVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupVerifyIPFlowFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr VerificationIPFlowResult, err error) {
+func (future WatchersGroupVerifyIPFlowFuture) Result(client WatchersGroupClient) (vifr VerificationIPFlowResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersVerifyIPFlowFuture")
+		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersGroupVerifyIPFlowFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vifr, err = client.VerifyIPFlowResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16106,12 +16445,12 @@ func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr Ver
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vifr, err = client.VerifyIPFlowResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/operations.go b/services/network/mgmt/2017-09-01/network/operationsgroup.go
similarity index 60%
rename from services/network/mgmt/2017-09-01/network/operations.go
rename to services/network/mgmt/2017-09-01/network/operationsgroup.go
index 6b6c967dc5a2..1b711f704834 100644
--- a/services/network/mgmt/2017-09-01/network/operations.go
+++ b/services/network/mgmt/2017-09-01/network/operationsgroup.go
@@ -24,47 +24,47 @@ import (
 	"net/http"
 )
 
-// OperationsClient is the network Client
-type OperationsClient struct {
+// OperationsGroupClient is the network Client
+type OperationsGroupClient struct {
 	BaseClient
 }
 
-// NewOperationsClient creates an instance of the OperationsClient client.
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewOperationsGroupClient creates an instance of the OperationsGroupClient client.
+func NewOperationsGroupClient(subscriptionID string) OperationsGroupClient {
+	return NewOperationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client.
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewOperationsGroupClientWithBaseURI creates an instance of the OperationsGroupClient client.
+func NewOperationsGroupClientWithBaseURI(baseURI string, subscriptionID string) OperationsGroupClient {
+	return OperationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List lists all of the available Network Rest API operations.
-func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) {
+func (client OperationsGroupClient) List(ctx context.Context) (result OperationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.olr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.olr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client OperationsGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	const APIVersion = "2017-09-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
@@ -80,14 +80,14 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client OperationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) {
+func (client OperationsGroupClient) ListResponder(resp *http.Response) (result OperationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -99,10 +99,10 @@ func (client OperationsClient) ListResponder(resp *http.Response) (result Operat
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client OperationsClient) listNextResults(lastResults OperationListResult) (result OperationListResult, err error) {
+func (client OperationsGroupClient) listNextResults(lastResults OperationListResult) (result OperationListResult, err error) {
 	req, err := lastResults.operationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.OperationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.OperationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -110,17 +110,17 @@ func (client OperationsClient) listNextResults(lastResults OperationListResult)
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.OperationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.OperationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) {
+func (client OperationsGroupClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/packetcaptures.go b/services/network/mgmt/2017-09-01/network/packetcapturesgroup.go
similarity index 71%
rename from services/network/mgmt/2017-09-01/network/packetcaptures.go
rename to services/network/mgmt/2017-09-01/network/packetcapturesgroup.go
index 251cc53a6251..46b8473a8f6a 100644
--- a/services/network/mgmt/2017-09-01/network/packetcaptures.go
+++ b/services/network/mgmt/2017-09-01/network/packetcapturesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// PacketCapturesClient is the network Client
-type PacketCapturesClient struct {
+// PacketCapturesGroupClient is the network Client
+type PacketCapturesGroupClient struct {
 	BaseClient
 }
 
-// NewPacketCapturesClient creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
-	return NewPacketCapturesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPacketCapturesGroupClient creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClient(subscriptionID string) PacketCapturesGroupClient {
+	return NewPacketCapturesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPacketCapturesClientWithBaseURI creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
-	return PacketCapturesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPacketCapturesGroupClientWithBaseURI creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesGroupClient {
+	return PacketCapturesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Create create and start a packet capture on the specified VM.
@@ -45,25 +45,25 @@ func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) P
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session. parameters is parameters that define the create
 // packet capture operation.
-func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesGroupCreateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PacketCaptureParameters", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.PacketCaptureParameters.Target", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "parameters.PacketCaptureParameters.StorageLocation", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PacketCapturesClient", "Create", err.Error())
+		return result, validation.NewError("network.PacketCapturesGroupClient", "Create", err.Error())
 	}
 
 	req, err := client.CreatePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName
 }
 
 // CreatePreparer prepares the Create request.
-func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
+func (client PacketCapturesGroupClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -96,7 +96,7 @@ func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceG
 
 // CreateSender sends the Create request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) CreateSender(req *http.Request) (future PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) CreateSender(req *http.Request) (future PacketCapturesGroupCreateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PacketCapturesClient) CreateSender(req *http.Request) (future Packe
 
 // CreateResponder handles the response to the Create request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -166,7 +166,7 @@ func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) DeleteSender(req *http.Request) (future PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) DeleteSender(req *http.Request) (future PacketCapturesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client PacketCapturesClient) DeleteSender(req *http.Request) (future Packe
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -241,14 +241,14 @@ func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -263,16 +263,16 @@ func (client PacketCapturesClient) GetResponder(resp *http.Response) (result Pac
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource. packetCaptureName is the name given to the packet capture session.
-func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupGetStatusFuture, err error) {
 	req, err := client.GetStatusPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -280,7 +280,7 @@ func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupN
 }
 
 // GetStatusPreparer prepares the GetStatus request.
-func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -303,7 +303,7 @@ func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resour
 
 // GetStatusSender sends the GetStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatusSender(req *http.Request) (future PacketCapturesGroupGetStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -318,7 +318,7 @@ func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future Pa
 
 // GetStatusResponder handles the response to the GetStatus request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
+func (client PacketCapturesGroupClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource.
-func (client PacketCapturesClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -378,14 +378,14 @@ func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -400,16 +400,16 @@ func (client PacketCapturesClient) ListResponder(resp *http.Response) (result Pa
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -417,7 +417,7 @@ func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName s
 }
 
 // StopPreparer prepares the Stop request.
-func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -440,7 +440,7 @@ func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGro
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) StopSender(req *http.Request) (future PacketCapturesGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -455,7 +455,7 @@ func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketC
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/publicipaddresses.go b/services/network/mgmt/2017-09-01/network/publicipaddressesgroup.go
similarity index 70%
rename from services/network/mgmt/2017-09-01/network/publicipaddresses.go
rename to services/network/mgmt/2017-09-01/network/publicipaddressesgroup.go
index c1ed81ffc9a6..6c9bf0cb5a37 100644
--- a/services/network/mgmt/2017-09-01/network/publicipaddresses.go
+++ b/services/network/mgmt/2017-09-01/network/publicipaddressesgroup.go
@@ -25,26 +25,26 @@ import (
 	"net/http"
 )
 
-// PublicIPAddressesClient is the network Client
-type PublicIPAddressesClient struct {
+// PublicIPAddressesGroupClient is the network Client
+type PublicIPAddressesGroupClient struct {
 	BaseClient
 }
 
-// NewPublicIPAddressesClient creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
-	return NewPublicIPAddressesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPublicIPAddressesGroupClient creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClient(subscriptionID string) PublicIPAddressesGroupClient {
+	return NewPublicIPAddressesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPublicIPAddressesClientWithBaseURI creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
-	return PublicIPAddressesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPublicIPAddressesGroupClientWithBaseURI creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesGroupClient {
+	return PublicIPAddressesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a static or dynamic public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address.
 // parameters is parameters supplied to the create or update public IP address operation.
-func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat", Name: validation.Null, Rule: false,
@@ -53,18 +53,18 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 						Chain: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat.IPConfiguration.IPConfigurationPropertiesFormat.PublicIPAddress", Name: validation.Null, Rule: false, Chain: nil}}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PublicIPAddressesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.PublicIPAddressesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, publicIPAddressName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -72,7 +72,7 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -96,7 +96,7 @@ func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (f
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -125,16 +125,16 @@ func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Respons
 // Delete deletes the specified public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet.
-func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, publicIPAddressName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -142,7 +142,7 @@ func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupN
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -164,7 +164,7 @@ func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resour
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) DeleteSender(req *http.Request) (future PublicIPAddressesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -179,7 +179,7 @@ func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future Pu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PublicIPAddressesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -193,30 +193,30 @@ func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet. expand is
 // expands referenced resources.
-func (client PublicIPAddressesClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -241,14 +241,14 @@ func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceG
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -265,30 +265,30 @@ func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. IPConfigurationName is the name of the IP configuration. publicIPAddressName is the name of
 // the public IP Address. expand is expands referenced resources.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetPublicIPAddressSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetPublicIPAddressResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressPreparer prepares the GetVirtualMachineScaleSetPublicIPAddress request.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -317,14 +317,14 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPr
 
 // GetVirtualMachineScaleSetPublicIPAddressSender sends the GetVirtualMachineScaleSetPublicIPAddress request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressResponder handles the response to the GetVirtualMachineScaleSetPublicIPAddress request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -338,31 +338,31 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressRe
 // List gets all public IP addresses in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client PublicIPAddressesClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -383,14 +383,14 @@ func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resource
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -402,10 +402,10 @@ func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -413,47 +413,47 @@ func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddres
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the public IP addresses in a subscription.
-func (client PublicIPAddressesClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -473,14 +473,14 @@ func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*htt
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -492,10 +492,10 @@ func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (res
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -503,17 +503,17 @@ func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAdd
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -523,31 +523,31 @@ func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (resu
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -569,14 +569,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 
 // ListVirtualMachineScaleSetPublicIPAddressesSender sends the ListVirtualMachineScaleSetPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -588,10 +588,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 }
 
 // listVirtualMachineScaleSetPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -599,17 +599,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddresse
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -620,31 +620,31 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the network
 // interface name. IPConfigurationName is the IP configuration name.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetVMPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -669,14 +669,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesSender sends the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -688,10 +688,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 }
 
 // listVirtualMachineScaleSetVMPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -699,17 +699,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddres
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	return
 }
@@ -718,16 +718,16 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address.
 // parameters is parameters supplied to update public IP address tags.
-func (client PublicIPAddressesClient) UpdateTags(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (result PublicIPAddressesUpdateTagsFuture, err error) {
+func (client PublicIPAddressesGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (result PublicIPAddressesGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, publicIPAddressName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -735,7 +735,7 @@ func (client PublicIPAddressesClient) UpdateTags(ctx context.Context, resourceGr
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client PublicIPAddressesClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -759,7 +759,7 @@ func (client PublicIPAddressesClient) UpdateTagsPreparer(ctx context.Context, re
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) UpdateTagsSender(req *http.Request) (future PublicIPAddressesUpdateTagsFuture, err error) {
+func (client PublicIPAddressesGroupClient) UpdateTagsSender(req *http.Request) (future PublicIPAddressesGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -774,7 +774,7 @@ func (client PublicIPAddressesClient) UpdateTagsSender(req *http.Request) (futur
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) UpdateTagsResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) UpdateTagsResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/routefilterrules.go b/services/network/mgmt/2017-09-01/network/routefilterrulesgroup.go
similarity index 72%
rename from services/network/mgmt/2017-09-01/network/routefilterrules.go
rename to services/network/mgmt/2017-09-01/network/routefilterrulesgroup.go
index ee226709f133..d6dc6dcd8c81 100644
--- a/services/network/mgmt/2017-09-01/network/routefilterrules.go
+++ b/services/network/mgmt/2017-09-01/network/routefilterrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// RouteFilterRulesClient is the network Client
-type RouteFilterRulesClient struct {
+// RouteFilterRulesGroupClient is the network Client
+type RouteFilterRulesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFilterRulesClient creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClient(subscriptionID string) RouteFilterRulesClient {
-	return NewRouteFilterRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFilterRulesGroupClient creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClient(subscriptionID string) RouteFilterRulesGroupClient {
+	return NewRouteFilterRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFilterRulesClientWithBaseURI creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesClient {
-	return RouteFilterRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFilterRulesGroupClientWithBaseURI creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesGroupClient {
+	return RouteFilterRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route filter.
@@ -45,25 +45,25 @@ func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the create or update
 // route filter rule operation.
-func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: routeFilterRuleParameters,
 			Constraints: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.RouteFilterRuleType", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.Communities", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.RouteFilterRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.RouteFilterRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourc
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -96,7 +96,7 @@ func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (fu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupNa
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -166,7 +166,7 @@ func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourc
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) DeleteSender(req *http.Request) (future RouteFilterRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future Rou
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFilterRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (resul
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -241,14 +241,14 @@ func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGr
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -262,31 +262,31 @@ func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result R
 // ListByRouteFilter gets all RouteFilterRules in a route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFilterRulesClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
 	result.fn = client.listByRouteFilterNextResults
 	req, err := client.ListByRouteFilterPreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.rfrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure sending request")
 		return
 	}
 
 	result.rfrlr, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByRouteFilterPreparer prepares the ListByRouteFilter request.
-func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -308,14 +308,14 @@ func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Conte
 
 // ListByRouteFilterSender sends the ListByRouteFilter request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByRouteFilterResponder handles the response to the ListByRouteFilter request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -327,10 +327,10 @@ func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Respo
 }
 
 // listByRouteFilterNextResults retrieves the next set of results, if any.
-func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
 	req, err := lastResults.routeFilterRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -338,17 +338,17 @@ func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults Ro
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByRouteFilterComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
 	result.page, err = client.ListByRouteFilter(ctx, resourceGroupName, routeFilterName)
 	return
 }
@@ -358,16 +358,16 @@ func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Conte
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the update route
 // filter rule operation.
-func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -375,7 +375,7 @@ func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupNa
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -400,7 +400,7 @@ func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourc
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) UpdateSender(req *http.Request) (future RouteFilterRulesGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -415,7 +415,7 @@ func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future Rou
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/routefilters.go b/services/network/mgmt/2017-09-01/network/routefiltersgroup.go
similarity index 66%
rename from services/network/mgmt/2017-09-01/network/routefilters.go
rename to services/network/mgmt/2017-09-01/network/routefiltersgroup.go
index 648c4574100e..e59c97a59ab9 100644
--- a/services/network/mgmt/2017-09-01/network/routefilters.go
+++ b/services/network/mgmt/2017-09-01/network/routefiltersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteFiltersClient is the network Client
-type RouteFiltersClient struct {
+// RouteFiltersGroupClient is the network Client
+type RouteFiltersGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFiltersClient creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
-	return NewRouteFiltersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFiltersGroupClient creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClient(subscriptionID string) RouteFiltersGroupClient {
+	return NewRouteFiltersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFiltersClientWithBaseURI creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
-	return RouteFiltersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFiltersGroupClientWithBaseURI creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersGroupClient {
+	return RouteFiltersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route filter in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the create or update route filter operation.
-func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGro
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -84,7 +84,7 @@ func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, res
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (r
 // Delete deletes the specified route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName s
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -152,7 +152,7 @@ func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGro
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) DeleteSender(req *http.Request) (future RouteFiltersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFiltersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result au
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. expand is
 // expands referenced express route bgp peering resources.
-func (client RouteFiltersClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -229,14 +229,14 @@ func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupN
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -248,31 +248,31 @@ func (client RouteFiltersClient) GetResponder(resp *http.Response) (result Route
 }
 
 // List gets all route filters in a subscription.
-func (client RouteFiltersClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -292,14 +292,14 @@ func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Reques
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -311,10 +311,10 @@ func (client RouteFiltersClient) ListResponder(resp *http.Response) (result Rout
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -322,17 +322,17 @@ func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResu
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
@@ -340,31 +340,31 @@ func (client RouteFiltersClient) ListComplete(ctx context.Context) (result Route
 // ListByResourceGroup gets all route filters in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteFiltersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listByResourceGroupNextResults
 	req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByResourceGroupPreparer prepares the ListByResourceGroup request.
-func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -385,14 +385,14 @@ func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context
 
 // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Respons
 }
 
 // listByResourceGroupNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults Rout
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.ListByResourceGroup(ctx, resourceGroupName)
 	return
 }
@@ -434,16 +434,16 @@ func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the update route filter operation.
-func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName s
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -475,7 +475,7 @@ func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGro
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) UpdateSender(req *http.Request) (future RouteFiltersGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFi
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/routes.go b/services/network/mgmt/2017-09-01/network/routesgroup.go
similarity index 69%
rename from services/network/mgmt/2017-09-01/network/routes.go
rename to services/network/mgmt/2017-09-01/network/routesgroup.go
index d1d2fc928d54..7f30086c6faa 100644
--- a/services/network/mgmt/2017-09-01/network/routes.go
+++ b/services/network/mgmt/2017-09-01/network/routesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RoutesClient is the network Client
-type RoutesClient struct {
+// RoutesGroupClient is the network Client
+type RoutesGroupClient struct {
 	BaseClient
 }
 
-// NewRoutesClient creates an instance of the RoutesClient client.
-func NewRoutesClient(subscriptionID string) RoutesClient {
-	return NewRoutesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRoutesGroupClient creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClient(subscriptionID string) RoutesGroupClient {
+	return NewRoutesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRoutesClientWithBaseURI creates an instance of the RoutesClient client.
-func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
-	return RoutesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRoutesGroupClientWithBaseURI creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClientWithBaseURI(baseURI string, subscriptionID string) RoutesGroupClient {
+	return RoutesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route. routeParameters is parameters supplied to the create or update route operation.
-func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, routeName, routeParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
+func (client RoutesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -85,7 +85,7 @@ func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceG
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdateSender(req *http.Request) (future RoutesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -100,7 +100,7 @@ func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future Route
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -115,16 +115,16 @@ func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -132,7 +132,7 @@ func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -155,7 +155,7 @@ func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) DeleteSender(req *http.Request) (future RoutesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -170,7 +170,7 @@ func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteF
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RoutesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -184,30 +184,30 @@ func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
+func (client RoutesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -230,14 +230,14 @@ func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName st
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) GetResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err
 // List gets all routes in a route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RoutesClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
+func (client RoutesGroupClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RoutesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -297,14 +297,14 @@ func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName s
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
+func (client RoutesGroupClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -316,10 +316,10 @@ func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListR
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RoutesClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
+func (client RoutesGroupClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
 	req, err := lastResults.routeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -327,17 +327,17 @@ func (client RoutesClient) listNextResults(lastResults RouteListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RoutesClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
+func (client RoutesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, routeTableName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/routetables.go b/services/network/mgmt/2017-09-01/network/routetablesgroup.go
similarity index 66%
rename from services/network/mgmt/2017-09-01/network/routetables.go
rename to services/network/mgmt/2017-09-01/network/routetablesgroup.go
index ec10e23455fa..2d6be14ac5fc 100644
--- a/services/network/mgmt/2017-09-01/network/routetables.go
+++ b/services/network/mgmt/2017-09-01/network/routetablesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteTablesClient is the network Client
-type RouteTablesClient struct {
+// RouteTablesGroupClient is the network Client
+type RouteTablesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteTablesClient creates an instance of the RouteTablesClient client.
-func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
-	return NewRouteTablesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteTablesGroupClient creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClient(subscriptionID string) RouteTablesGroupClient {
+	return NewRouteTablesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteTablesClientWithBaseURI creates an instance of the RouteTablesClient client.
-func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
-	return RouteTablesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteTablesGroupClientWithBaseURI creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesGroupClient {
+	return RouteTablesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate create or updates a route table in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters
 // is parameters supplied to the create or update route table operation.
-func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGrou
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
+func (client RouteTablesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -84,7 +84,7 @@ func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, reso
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (re
 // Delete deletes the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName st
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -152,7 +152,7 @@ func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGrou
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) DeleteSender(req *http.Request) (future RouteTablesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTab
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteTablesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result aut
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. expand is
 // expands referenced resources.
-func (client RouteTablesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
+func (client RouteTablesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -229,14 +229,14 @@ func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupNa
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteT
 // List gets all route tables in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteTablesClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupN
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client RouteTablesClient) ListResponder(resp *http.Response) (result Route
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all route tables in a subscription.
-func (client RouteTablesClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Requ
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result Ro
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListRes
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -434,16 +434,16 @@ func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result Rou
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters
 // is parameters supplied to update route table tags.
-func (client RouteTablesClient) UpdateTags(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (result RouteTablesUpdateTagsFuture, err error) {
+func (client RouteTablesGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (result RouteTablesGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, routeTableName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client RouteTablesClient) UpdateTags(ctx context.Context, resourceGroupNam
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client RouteTablesClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (*http.Request, error) {
+func (client RouteTablesGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -475,7 +475,7 @@ func (client RouteTablesClient) UpdateTagsPreparer(ctx context.Context, resource
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) UpdateTagsSender(req *http.Request) (future RouteTablesUpdateTagsFuture, err error) {
+func (client RouteTablesGroupClient) UpdateTagsSender(req *http.Request) (future RouteTablesGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client RouteTablesClient) UpdateTagsSender(req *http.Request) (future Rout
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) UpdateTagsResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) UpdateTagsResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/securitygroups.go b/services/network/mgmt/2017-09-01/network/securitygroupsgroup.go
similarity index 66%
rename from services/network/mgmt/2017-09-01/network/securitygroups.go
rename to services/network/mgmt/2017-09-01/network/securitygroupsgroup.go
index 4fc86116a7e2..98eb11107661 100644
--- a/services/network/mgmt/2017-09-01/network/securitygroups.go
+++ b/services/network/mgmt/2017-09-01/network/securitygroupsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// SecurityGroupsClient is the network Client
-type SecurityGroupsClient struct {
+// SecurityGroupsGroupClient is the network Client
+type SecurityGroupsGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityGroupsClient creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
-	return NewSecurityGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityGroupsGroupClient creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClient(subscriptionID string) SecurityGroupsGroupClient {
+	return NewSecurityGroupsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityGroupsClientWithBaseURI creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
-	return SecurityGroupsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityGroupsGroupClientWithBaseURI creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsGroupClient {
+	return SecurityGroupsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network security group in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. parameters is parameters supplied to the create or update network security group operation.
-func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceG
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (futu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -114,16 +114,16 @@ func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -131,7 +131,7 @@ func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -153,7 +153,7 @@ func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) DeleteSender(req *http.Request) (future SecurityGroupsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -168,7 +168,7 @@ func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future Secur
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityGroupsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -182,30 +182,30 @@ func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. expand is expands referenced resources.
-func (client SecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -230,14 +230,14 @@ func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result Sec
 // List gets all network security groups in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client SecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -296,14 +296,14 @@ func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -315,10 +315,10 @@ func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result Se
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -326,47 +326,47 @@ func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupList
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network security groups in a subscription.
-func (client SecurityGroupsClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -386,14 +386,14 @@ func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.R
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -405,10 +405,10 @@ func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -416,17 +416,17 @@ func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupL
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -435,16 +435,16 @@ func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. parameters is parameters supplied to update network security group tags.
-func (client SecurityGroupsClient) UpdateTags(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (result SecurityGroupsUpdateTagsFuture, err error) {
+func (client SecurityGroupsGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (result SecurityGroupsGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -452,7 +452,7 @@ func (client SecurityGroupsClient) UpdateTags(ctx context.Context, resourceGroup
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client SecurityGroupsClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -476,7 +476,7 @@ func (client SecurityGroupsClient) UpdateTagsPreparer(ctx context.Context, resou
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) UpdateTagsSender(req *http.Request) (future SecurityGroupsUpdateTagsFuture, err error) {
+func (client SecurityGroupsGroupClient) UpdateTagsSender(req *http.Request) (future SecurityGroupsGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -491,7 +491,7 @@ func (client SecurityGroupsClient) UpdateTagsSender(req *http.Request) (future S
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) UpdateTagsResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) UpdateTagsResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/securityrules.go b/services/network/mgmt/2017-09-01/network/securityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-09-01/network/securityrules.go
rename to services/network/mgmt/2017-09-01/network/securityrulesgroup.go
index caf0436dea26..16cb92ceaa1c 100644
--- a/services/network/mgmt/2017-09-01/network/securityrules.go
+++ b/services/network/mgmt/2017-09-01/network/securityrulesgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SecurityRulesClient is the network Client
-type SecurityRulesClient struct {
+// SecurityRulesGroupClient is the network Client
+type SecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityRulesClient creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
-	return NewSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityRulesGroupClient creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClient(subscriptionID string) SecurityRulesGroupClient {
+	return NewSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityRulesClientWithBaseURI creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
-	return SecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityRulesGroupClientWithBaseURI creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesGroupClient {
+	return SecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a security rule in the specified network security group.
@@ -44,16 +44,16 @@ func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) Se
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule. securityRuleParameters is parameters supplied
 // to the create or update network security rule operation.
-func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
+func (client SecurityRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -156,7 +156,7 @@ func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) DeleteSender(req *http.Request) (future SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) DeleteSender(req *http.Request) (future SecurityRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SecurityRulesClient) DeleteSender(req *http.Request) (future Securi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -231,14 +231,14 @@ func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -253,31 +253,31 @@ func (client SecurityRulesClient) GetResponder(resp *http.Response) (result Secu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client SecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -299,14 +299,14 @@ func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -318,10 +318,10 @@ func (client SecurityRulesClient) ListResponder(resp *http.Response) (result Sec
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -329,17 +329,17 @@ func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client SecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/subnets.go b/services/network/mgmt/2017-09-01/network/subnetsgroup.go
similarity index 69%
rename from services/network/mgmt/2017-09-01/network/subnets.go
rename to services/network/mgmt/2017-09-01/network/subnetsgroup.go
index 4a8b41d3fdf0..1802e12539da 100644
--- a/services/network/mgmt/2017-09-01/network/subnets.go
+++ b/services/network/mgmt/2017-09-01/network/subnetsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SubnetsClient is the network Client
-type SubnetsClient struct {
+// SubnetsGroupClient is the network Client
+type SubnetsGroupClient struct {
 	BaseClient
 }
 
-// NewSubnetsClient creates an instance of the SubnetsClient client.
-func NewSubnetsClient(subscriptionID string) SubnetsClient {
-	return NewSubnetsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSubnetsGroupClient creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClient(subscriptionID string) SubnetsGroupClient {
+	return NewSubnetsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSubnetsClientWithBaseURI creates an instance of the SubnetsClient client.
-func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
-	return SubnetsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSubnetsGroupClientWithBaseURI creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClientWithBaseURI(baseURI string, subscriptionID string) SubnetsGroupClient {
+	return SubnetsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a subnet in the specified virtual network.
@@ -44,16 +44,16 @@ func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsC
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. subnetParameters is parameters supplied to the create or update subnet
 // operation.
-func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, subnetParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupNam
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
+func (client SubnetsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -86,7 +86,7 @@ func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resource
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateSender(req *http.Request) (future SubnetsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future Subn
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet.
-func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
+func (client SubnetsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -156,7 +156,7 @@ func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupNam
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) DeleteSender(req *http.Request) (future SubnetsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDelet
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SubnetsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autores
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. expand is expands referenced resources.
-func (client SubnetsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
+func (client SubnetsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
+func (client SubnetsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -234,14 +234,14 @@ func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName s
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) GetResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -255,31 +255,31 @@ func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, er
 // List gets all subnets in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client SubnetsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
+func (client SubnetsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.slr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.slr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client SubnetsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -301,14 +301,14 @@ func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,10 +320,10 @@ func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetLis
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
 	req, err := lastResults.subnetListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -331,17 +331,17 @@ func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (resul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SubnetsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
+func (client SubnetsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/usages.go b/services/network/mgmt/2017-09-01/network/usagesgroup.go
similarity index 64%
rename from services/network/mgmt/2017-09-01/network/usages.go
rename to services/network/mgmt/2017-09-01/network/usagesgroup.go
index 0fb38cab0629..4632d8b6720d 100644
--- a/services/network/mgmt/2017-09-01/network/usages.go
+++ b/services/network/mgmt/2017-09-01/network/usagesgroup.go
@@ -25,55 +25,55 @@ import (
 	"net/http"
 )
 
-// UsagesClient is the network Client
-type UsagesClient struct {
+// UsagesGroupClient is the network Client
+type UsagesGroupClient struct {
 	BaseClient
 }
 
-// NewUsagesClient creates an instance of the UsagesClient client.
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return NewUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewUsagesGroupClient creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClient(subscriptionID string) UsagesGroupClient {
+	return NewUsagesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewUsagesClientWithBaseURI creates an instance of the UsagesClient client.
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return UsagesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewUsagesGroupClientWithBaseURI creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClientWithBaseURI(baseURI string, subscriptionID string) UsagesGroupClient {
+	return UsagesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list network usages for a subscription.
 //
 // location is the location where resource usage is queried.
-func (client UsagesClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
+func (client UsagesGroupClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: location,
 			Constraints: []validation.Constraint{{Target: "location", Name: validation.Pattern, Rule: `^[-\w\._ ]+$`, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.UsagesClient", "List", err.Error())
+		return result, validation.NewError("network.UsagesGroupClient", "List", err.Error())
 	}
 
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ulr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ulr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client UsagesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -94,14 +94,14 @@ func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client UsagesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client UsagesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,10 +113,10 @@ func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesList
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
 	req, err := lastResults.usagesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -124,17 +124,17 @@ func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client UsagesClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
+func (client UsagesGroupClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/version.go b/services/network/mgmt/2017-09-01/network/version.go
index e1fe174ca4f6..63850a4b2460 100644
--- a/services/network/mgmt/2017-09-01/network/version.go
+++ b/services/network/mgmt/2017-09-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2017-09-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go b/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnectionsgroup.go
similarity index 71%
rename from services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go
rename to services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnectionsgroup.go
index 7a4706c95abe..08269412fa33 100644
--- a/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnections.go
+++ b/services/network/mgmt/2017-09-01/network/virtualnetworkgatewayconnectionsgroup.go
@@ -25,20 +25,21 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewayConnectionsClient is the network Client
-type VirtualNetworkGatewayConnectionsClient struct {
+// VirtualNetworkGatewayConnectionsGroupClient is the network Client
+type VirtualNetworkGatewayConnectionsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewayConnectionsClient creates an instance of the VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return NewVirtualNetworkGatewayConnectionsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewayConnectionsGroupClient creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClient(subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewayConnectionsClientWithBaseURI creates an instance of the
-// VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return VirtualNetworkGatewayConnectionsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return VirtualNetworkGatewayConnectionsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway connection in the specified resource group.
@@ -46,7 +47,7 @@ func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscr
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection. parameters is parameters supplied to the create or update virtual network
 // gateway connection operation.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat", Name: validation.Null, Rule: true,
@@ -57,18 +58,18 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 					{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2", Name: validation.Null, Rule: false,
 						Chain: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -76,7 +77,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -100,7 +101,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -115,7 +116,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *h
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -130,16 +131,16 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -147,7 +148,7 @@ func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -169,7 +170,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +185,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Requ
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -198,30 +199,30 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -243,14 +244,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Con
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -266,30 +267,30 @@ func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection shared key name.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
 	req, err := client.GetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSharedKeySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSharedKeyPreparer prepares the GetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -311,14 +312,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx co
 
 // GetSharedKeySender sends the GetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSharedKeyResponder handles the response to the GetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,31 +334,31 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp
 // created.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewayConnectionsClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vngclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vngclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -378,14 +379,14 @@ func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Co
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -397,10 +398,10 @@ func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayConnectionListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -408,17 +409,17 @@ func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -430,25 +431,25 @@ func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Co
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection reset shared key Name. parameters is parameters supplied to the begin reset virtual network
 // gateway connection shared key operation through network resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.InclusiveMaximum, Rule: 128, Chain: nil},
 					{Target: "parameters.KeyLength", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", err.Error())
 	}
 
 	req, err := client.ResetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -456,7 +457,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.
 }
 
 // ResetSharedKeyPreparer prepares the ResetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -480,7 +481,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx
 
 // ResetSharedKeySender sends the ResetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -495,7 +496,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *h
 
 // ResetSharedKeyResponder handles the response to the ResetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -513,22 +514,22 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection name. parameters is parameters supplied to the Begin Set Virtual Network Gateway connection
 // Shared key operation throughNetwork resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Value", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", err.Error())
 	}
 
 	req, err := client.SetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -536,7 +537,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Co
 }
 
 // SetSharedKeyPreparer prepares the SetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -560,7 +561,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx co
 
 // SetSharedKeySender sends the SetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -575,7 +576,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *htt
 
 // SetSharedKeyResponder handles the response to the SetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -591,16 +592,16 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection. parameters is parameters supplied to update virtual network gateway
 // connection tags.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (result VirtualNetworkGatewayConnectionsUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (result VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -608,7 +609,7 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTags(ctx context.Cont
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -632,7 +633,7 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsPreparer(ctx cont
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewayConnectionsUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -647,7 +648,7 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsSender(req *http.
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListEntity, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListEntity, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go b/services/network/mgmt/2017-09-01/network/virtualnetworkgatewaysgroup.go
similarity index 73%
rename from services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go
rename to services/network/mgmt/2017-09-01/network/virtualnetworkgatewaysgroup.go
index 8bac8e007d8d..c1ffb4cc64e5 100644
--- a/services/network/mgmt/2017-09-01/network/virtualnetworkgateways.go
+++ b/services/network/mgmt/2017-09-01/network/virtualnetworkgatewaysgroup.go
@@ -25,41 +25,41 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewaysClient is the network Client
-type VirtualNetworkGatewaysClient struct {
+// VirtualNetworkGatewaysGroupClient is the network Client
+type VirtualNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewaysClient creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClient(subscriptionID string) VirtualNetworkGatewaysClient {
-	return NewVirtualNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewaysGroupClient creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClient(subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return NewVirtualNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewaysClientWithBaseURI creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysClient {
-	return VirtualNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewaysGroupClientWithBaseURI creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return VirtualNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to create or update virtual network gateway operation.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -67,7 +67,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -91,7 +91,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -106,7 +106,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -121,16 +121,16 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -138,7 +138,7 @@ func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -160,7 +160,7 @@ func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -175,7 +175,7 @@ func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -191,16 +191,16 @@ func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response)
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	req, err := client.GeneratevpnclientpackagePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GeneratevpnclientpackageSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -208,7 +208,7 @@ func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.
 }
 
 // GeneratevpnclientpackagePreparer prepares the Generatevpnclientpackage request.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -232,7 +232,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx
 
 // GeneratevpnclientpackageSender sends the Generatevpnclientpackage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -247,7 +247,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *h
 
 // GeneratevpnclientpackageResponder handles the response to the Generatevpnclientpackage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -264,16 +264,16 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	req, err := client.GenerateVpnProfilePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GenerateVpnProfileSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -281,7 +281,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Contex
 }
 
 // GenerateVpnProfilePreparer prepares the GenerateVpnProfile request.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -305,7 +305,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx contex
 
 // GenerateVpnProfileSender sends the GenerateVpnProfile request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -320,7 +320,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Re
 
 // GenerateVpnProfileResponder handles the response to the GenerateVpnProfile request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -335,30 +335,30 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *htt
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -380,14 +380,14 @@ func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -403,16 +403,16 @@ func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	req, err := client.GetAdvertisedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetAdvertisedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -420,7 +420,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Conte
 }
 
 // GetAdvertisedRoutesPreparer prepares the GetAdvertisedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -443,7 +443,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx conte
 
 // GetAdvertisedRoutesSender sends the GetAdvertisedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -458,7 +458,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.R
 
 // GetAdvertisedRoutesResponder handles the response to the GetAdvertisedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -473,16 +473,16 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer to retrieve the status of.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	req, err := client.GetBgpPeerStatusPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetBgpPeerStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -490,7 +490,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context,
 }
 
 // GetBgpPeerStatusPreparer prepares the GetBgpPeerStatus request.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -515,7 +515,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.
 
 // GetBgpPeerStatusSender sends the GetBgpPeerStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -530,7 +530,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Requ
 
 // GetBgpPeerStatusResponder handles the response to the GetBgpPeerStatus request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -546,16 +546,16 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	req, err := client.GetLearnedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetLearnedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -563,7 +563,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context,
 }
 
 // GetLearnedRoutesPreparer prepares the GetLearnedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -585,7 +585,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.
 
 // GetLearnedRoutesSender sends the GetLearnedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -600,7 +600,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Requ
 
 // GetLearnedRoutesResponder handles the response to the GetLearnedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -616,16 +616,16 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURL(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURL(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture, err error) {
 	req, err := client.GetVpnProfilePackageURLPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetVpnProfilePackageURL", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetVpnProfilePackageURL", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVpnProfilePackageURLSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetVpnProfilePackageURL", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetVpnProfilePackageURL", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -633,7 +633,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURL(ctx context.C
 }
 
 // GetVpnProfilePackageURLPreparer prepares the GetVpnProfilePackageURL request.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -655,7 +655,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLPreparer(ctx c
 
 // GetVpnProfilePackageURLSender sends the GetVpnProfilePackageURL request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLSender(req *http.Request) (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -670,7 +670,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLSender(req *ht
 
 // GetVpnProfilePackageURLResponder handles the response to the GetVpnProfilePackageURL request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -684,31 +684,31 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLResponder(resp
 // List gets all virtual network gateways by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -729,14 +729,14 @@ func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -748,10 +748,10 @@ func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -759,17 +759,17 @@ func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -778,31 +778,31 @@ func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
 	result.fn = client.listConnectionsNextResults
 	req, err := client.ListConnectionsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.vnglcr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglcr, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListConnectionsPreparer prepares the ListConnections request.
-func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -824,14 +824,14 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.C
 
 // ListConnectionsSender sends the ListConnections request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListConnectionsResponder handles the response to the ListConnections request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -843,10 +843,10 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.R
 }
 
 // listConnectionsNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListConnectionsResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -854,17 +854,17 @@ func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResult
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListConnectionsComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
 	result.page, err = client.ListConnections(ctx, resourceGroupName, virtualNetworkGatewayName)
 	return
 }
@@ -874,16 +874,16 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.C
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. gatewayVip is virtual network gateway vip address supplied to the begin reset of the
 // active-active feature enabled gateway.
-func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysGroupResetFuture, err error) {
 	req, err := client.ResetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, gatewayVip)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -891,7 +891,7 @@ func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGr
 }
 
 // ResetPreparer prepares the Reset request.
-func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -916,7 +916,7 @@ func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, re
 
 // ResetSender sends the Reset request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysGroupResetFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -931,7 +931,7 @@ func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (futur
 
 // ResetResponder handles the response to the Reset request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -946,30 +946,30 @@ func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) (
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevices(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevices(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result String, err error) {
 	req, err := client.SupportedVpnDevicesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "SupportedVpnDevices", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "SupportedVpnDevices", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.SupportedVpnDevicesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "SupportedVpnDevices", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "SupportedVpnDevices", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.SupportedVpnDevicesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "SupportedVpnDevices", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "SupportedVpnDevices", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // SupportedVpnDevicesPreparer prepares the SupportedVpnDevices request.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevicesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -991,14 +991,14 @@ func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesPreparer(ctx conte
 
 // SupportedVpnDevicesSender sends the SupportedVpnDevices request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevicesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // SupportedVpnDevicesResponder handles the response to the SupportedVpnDevices request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevicesResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1013,16 +1013,16 @@ func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to update virtual network gateway tags.
-func (client VirtualNetworkGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (result VirtualNetworkGatewaysUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (result VirtualNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1030,7 +1030,7 @@ func (client VirtualNetworkGatewaysClient) UpdateTags(ctx context.Context, resou
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client VirtualNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -1054,7 +1054,7 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Contex
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewaysUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1069,7 +1069,7 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1085,30 +1085,30 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsResponder(resp *http.Respon
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection for which the configuration script is generated. parameters is parameters
 // supplied to the generate vpn device script operation.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScript(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScript(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (result String, err error) {
 	req, err := client.VpnDeviceConfigurationScriptPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "VpnDeviceConfigurationScript", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "VpnDeviceConfigurationScript", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.VpnDeviceConfigurationScriptSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "VpnDeviceConfigurationScript", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "VpnDeviceConfigurationScript", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.VpnDeviceConfigurationScriptResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "VpnDeviceConfigurationScript", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "VpnDeviceConfigurationScript", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // VpnDeviceConfigurationScriptPreparer prepares the VpnDeviceConfigurationScript request.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScriptPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -1132,14 +1132,14 @@ func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptPreparer(
 
 // VpnDeviceConfigurationScriptSender sends the VpnDeviceConfigurationScript request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScriptSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // VpnDeviceConfigurationScriptResponder handles the response to the VpnDeviceConfigurationScript request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScriptResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go b/services/network/mgmt/2017-09-01/network/virtualnetworkpeeringsgroup.go
similarity index 70%
rename from services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go
rename to services/network/mgmt/2017-09-01/network/virtualnetworkpeeringsgroup.go
index 3038875ca5eb..e38e0446eac2 100644
--- a/services/network/mgmt/2017-09-01/network/virtualnetworkpeerings.go
+++ b/services/network/mgmt/2017-09-01/network/virtualnetworkpeeringsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkPeeringsClient is the network Client
-type VirtualNetworkPeeringsClient struct {
+// VirtualNetworkPeeringsGroupClient is the network Client
+type VirtualNetworkPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkPeeringsClient creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
-	return NewVirtualNetworkPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkPeeringsGroupClient creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClient(subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return NewVirtualNetworkPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkPeeringsClientWithBaseURI creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
-	return VirtualNetworkPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkPeeringsGroupClientWithBaseURI creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return VirtualNetworkPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified virtual network.
@@ -44,16 +44,16 @@ func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID s
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the peering. virtualNetworkPeeringParameters is parameters supplied to
 // the create or update virtual network peering operation.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -86,7 +86,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -156,7 +156,7 @@ func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -231,14 +231,14 @@ func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +252,31 @@ func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (re
 // List gets all virtual network peerings in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworkPeeringsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
+func (client VirtualNetworkPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -298,14 +298,14 @@ func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +317,10 @@ func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
 	req, err := lastResults.virtualNetworkPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +328,17 @@ func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-09-01/network/virtualnetworks.go b/services/network/mgmt/2017-09-01/network/virtualnetworksgroup.go
similarity index 71%
rename from services/network/mgmt/2017-09-01/network/virtualnetworks.go
rename to services/network/mgmt/2017-09-01/network/virtualnetworksgroup.go
index 405a3a23e7d5..6f3cf2b1b0d4 100644
--- a/services/network/mgmt/2017-09-01/network/virtualnetworks.go
+++ b/services/network/mgmt/2017-09-01/network/virtualnetworksgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// VirtualNetworksClient is the network Client
-type VirtualNetworksClient struct {
+// VirtualNetworksGroupClient is the network Client
+type VirtualNetworksGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworksClient creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return NewVirtualNetworksClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworksGroupClient creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClient(subscriptionID string) VirtualNetworksGroupClient {
+	return NewVirtualNetworksGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworksClientWithBaseURI creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return VirtualNetworksClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworksGroupClientWithBaseURI creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksGroupClient {
+	return VirtualNetworksGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckIPAddressAvailability checks whether a private IP address is available for use.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // IPAddress is the private IP address to be verified.
-func (client VirtualNetworksClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
 	req, err := client.CheckIPAddressAvailabilityPreparer(ctx, resourceGroupName, virtualNetworkName, IPAddress)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CheckIPAddressAvailabilitySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CheckIPAddressAvailabilityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CheckIPAddressAvailabilityPreparer prepares the CheckIPAddressAvailability request.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -91,14 +91,14 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx conte
 
 // CheckIPAddressAvailabilitySender sends the CheckIPAddressAvailability request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CheckIPAddressAvailabilityResponder handles the response to the CheckIPAddressAvailability request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // parameters is parameters supplied to the create or update virtual network operation
-func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -154,7 +154,7 @@ func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -169,7 +169,7 @@ func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -183,16 +183,16 @@ func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response)
 // Delete deletes the specified virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -200,7 +200,7 @@ func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -222,7 +222,7 @@ func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) DeleteSender(req *http.Request) (future VirtualNetworksGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -237,7 +237,7 @@ func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future Virt
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworksGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,30 +251,30 @@ func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // expand is expands referenced resources.
-func (client VirtualNetworksClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -299,14 +299,14 @@ func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,31 +320,31 @@ func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result Vi
 // List gets all virtual networks in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworksClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -365,14 +365,14 @@ func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -384,10 +384,10 @@ func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result V
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -395,47 +395,47 @@ func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all virtual networks in a subscription.
-func (client VirtualNetworksClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -455,14 +455,14 @@ func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -474,10 +474,10 @@ func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (resul
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -485,17 +485,17 @@ func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetwor
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -503,31 +503,31 @@ func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result
 // ListUsage lists usage stats.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
 	result.fn = client.listUsageNextResults
 	req, err := client.ListUsagePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.vnlur.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlur, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListUsagePreparer prepares the ListUsage request.
-func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -549,14 +549,14 @@ func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resou
 
 // ListUsageSender sends the ListUsage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListUsageSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListUsageSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListUsageResponder handles the response to the ListUsage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -568,10 +568,10 @@ func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (res
 }
 
 // listUsageNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
 	req, err := lastResults.virtualNetworkListUsageResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -579,17 +579,17 @@ func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetw
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListUsageComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
 	result.page, err = client.ListUsage(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
@@ -598,16 +598,16 @@ func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resou
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // parameters is parameters supplied to update virtual network tags.
-func (client VirtualNetworksClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (result VirtualNetworksUpdateTagsFuture, err error) {
+func (client VirtualNetworksGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (result VirtualNetworksGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -615,7 +615,7 @@ func (client VirtualNetworksClient) UpdateTags(ctx context.Context, resourceGrou
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client VirtualNetworksClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -639,7 +639,7 @@ func (client VirtualNetworksClient) UpdateTagsPreparer(ctx context.Context, reso
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) UpdateTagsSender(req *http.Request) (future VirtualNetworksUpdateTagsFuture, err error) {
+func (client VirtualNetworksGroupClient) UpdateTagsSender(req *http.Request) (future VirtualNetworksGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -654,7 +654,7 @@ func (client VirtualNetworksClient) UpdateTagsSender(req *http.Request) (future
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-09-01/network/watchers.go b/services/network/mgmt/2017-09-01/network/watchersgroup.go
similarity index 71%
rename from services/network/mgmt/2017-09-01/network/watchers.go
rename to services/network/mgmt/2017-09-01/network/watchersgroup.go
index 0cbbb2bbfa53..f10df8c645b8 100644
--- a/services/network/mgmt/2017-09-01/network/watchers.go
+++ b/services/network/mgmt/2017-09-01/network/watchersgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// WatchersClient is the network Client
-type WatchersClient struct {
+// WatchersGroupClient is the network Client
+type WatchersGroupClient struct {
 	BaseClient
 }
 
-// NewWatchersClient creates an instance of the WatchersClient client.
-func NewWatchersClient(subscriptionID string) WatchersClient {
-	return NewWatchersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewWatchersGroupClient creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClient(subscriptionID string) WatchersGroupClient {
+	return NewWatchersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewWatchersClientWithBaseURI creates an instance of the WatchersClient client.
-func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) WatchersClient {
-	return WatchersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewWatchersGroupClientWithBaseURI creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClientWithBaseURI(baseURI string, subscriptionID string) WatchersGroupClient {
+	return WatchersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckConnectivity verifies the possibility of establishing a direct TCP connection from a virtual machine to a given
@@ -45,24 +45,24 @@ func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) Watcher
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that determine how the connectivity check will be performed.
-func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersGroupCheckConnectivityFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.Source.ResourceID", Name: validation.Null, Rule: true, Chain: nil}}},
 				{Target: "parameters.Destination", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "CheckConnectivity", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "CheckConnectivity", err.Error())
 	}
 
 	req, err := client.CheckConnectivityPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CheckConnectivitySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -70,7 +70,7 @@ func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGrou
 }
 
 // CheckConnectivityPreparer prepares the CheckConnectivity request.
-func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
+func (client WatchersGroupClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -94,7 +94,7 @@ func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, reso
 
 // CheckConnectivitySender sends the CheckConnectivity request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivitySender(req *http.Request) (future WatchersGroupCheckConnectivityFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -109,7 +109,7 @@ func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future
 
 // CheckConnectivityResponder handles the response to the CheckConnectivity request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
+func (client WatchersGroupClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -124,30 +124,30 @@ func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the network watcher resource.
-func (client WatchersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CreateOrUpdateSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
+func (client WatchersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -171,14 +171,14 @@ func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourc
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -192,16 +192,16 @@ func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (resul
 // Delete deletes the specified network watcher resource.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -209,7 +209,7 @@ func (client WatchersClient) Delete(ctx context.Context, resourceGroupName strin
 }
 
 // DeletePreparer prepares the Delete request.
-func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -231,7 +231,7 @@ func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupNa
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) DeleteSender(req *http.Request) (future WatchersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -246,7 +246,7 @@ func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDel
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client WatchersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -259,30 +259,30 @@ func (client WatchersClient) DeleteResponder(resp *http.Response) (result autore
 // Get gets the specified network watcher by resource group.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
+func (client WatchersGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -304,14 +304,14 @@ func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) GetResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -327,25 +327,25 @@ func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher,
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that determine Azure reachability report configuration.
-func (client WatchersClient) GetAzureReachabilityReport(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (result WatchersGetAzureReachabilityReportFuture, err error) {
+func (client WatchersGroupClient) GetAzureReachabilityReport(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (result WatchersGroupGetAzureReachabilityReportFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ProviderLocation", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.ProviderLocation.Country", Name: validation.Null, Rule: true, Chain: nil}}},
 				{Target: "parameters.StartTime", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.EndTime", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetAzureReachabilityReport", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetAzureReachabilityReport", err.Error())
 	}
 
 	req, err := client.GetAzureReachabilityReportPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetAzureReachabilityReport", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetAzureReachabilityReport", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetAzureReachabilityReportSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetAzureReachabilityReport", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetAzureReachabilityReport", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -353,7 +353,7 @@ func (client WatchersClient) GetAzureReachabilityReport(ctx context.Context, res
 }
 
 // GetAzureReachabilityReportPreparer prepares the GetAzureReachabilityReport request.
-func (client WatchersClient) GetAzureReachabilityReportPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetAzureReachabilityReportPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -377,7 +377,7 @@ func (client WatchersClient) GetAzureReachabilityReportPreparer(ctx context.Cont
 
 // GetAzureReachabilityReportSender sends the GetAzureReachabilityReport request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetAzureReachabilityReportSender(req *http.Request) (future WatchersGetAzureReachabilityReportFuture, err error) {
+func (client WatchersGroupClient) GetAzureReachabilityReportSender(req *http.Request) (future WatchersGroupGetAzureReachabilityReportFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -392,7 +392,7 @@ func (client WatchersClient) GetAzureReachabilityReportSender(req *http.Request)
 
 // GetAzureReachabilityReportResponder handles the response to the GetAzureReachabilityReport request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetAzureReachabilityReportResponder(resp *http.Response) (result AzureReachabilityReport, err error) {
+func (client WatchersGroupClient) GetAzureReachabilityReportResponder(resp *http.Response) (result AzureReachabilityReport, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -407,22 +407,22 @@ func (client WatchersClient) GetAzureReachabilityReportResponder(resp *http.Resp
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define a resource to query flow log status.
-func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGroupGetFlowLogStatusFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetFlowLogStatus", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetFlowLogStatus", err.Error())
 	}
 
 	req, err := client.GetFlowLogStatusPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetFlowLogStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -430,7 +430,7 @@ func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroup
 }
 
 // GetFlowLogStatusPreparer prepares the GetFlowLogStatus request.
-func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -454,7 +454,7 @@ func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resou
 
 // GetFlowLogStatusSender sends the GetFlowLogStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGroupGetFlowLogStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -469,7 +469,7 @@ func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future W
 
 // GetFlowLogStatusResponder handles the response to the GetFlowLogStatus request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -484,24 +484,24 @@ func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the source and destination endpoint.
-func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGroupGetNextHopFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.SourceIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.DestinationIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetNextHop", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetNextHop", err.Error())
 	}
 
 	req, err := client.GetNextHopPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetNextHopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -509,7 +509,7 @@ func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName s
 }
 
 // GetNextHopPreparer prepares the GetNextHop request.
-func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -533,7 +533,7 @@ func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGro
 
 // GetNextHopSender sends the GetNextHop request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetNextHopSender(req *http.Request) (future WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHopSender(req *http.Request) (future WatchersGroupGetNextHopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -548,7 +548,7 @@ func (client WatchersClient) GetNextHopSender(req *http.Request) (future Watcher
 
 // GetNextHopResponder handles the response to the GetNextHop request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
+func (client WatchersGroupClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -563,36 +563,36 @@ func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result Ne
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the representation of topology.
-func (client WatchersClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceGroupName", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTopology", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTopology", err.Error())
 	}
 
 	req, err := client.GetTopologyPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetTopologySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetTopologyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetTopologyPreparer prepares the GetTopology request.
-func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -616,14 +616,14 @@ func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGr
 
 // GetTopologySender sends the GetTopology request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTopologySender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetTopologySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetTopologyResponder handles the response to the GetTopology request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -638,7 +638,7 @@ func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result T
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to troubleshoot.
-func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGroupGetTroubleshootingFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -646,18 +646,18 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 					Chain: []validation.Constraint{{Target: "parameters.TroubleshootingProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.TroubleshootingProperties.StoragePath", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshooting", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshooting", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -665,7 +665,7 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 }
 
 // GetTroubleshootingPreparer prepares the GetTroubleshooting request.
-func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -689,7 +689,7 @@ func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, res
 
 // GetTroubleshootingSender sends the GetTroubleshooting request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingSender(req *http.Request) (future WatchersGroupGetTroubleshootingFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -704,7 +704,7 @@ func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future
 
 // GetTroubleshootingResponder handles the response to the GetTroubleshooting request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -719,22 +719,22 @@ func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to query the troubleshooting result.
-func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGroupGetTroubleshootingResultFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshootingResult", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshootingResult", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingResultPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingResultSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -742,7 +742,7 @@ func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resou
 }
 
 // GetTroubleshootingResultPreparer prepares the GetTroubleshootingResult request.
-func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -766,7 +766,7 @@ func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Contex
 
 // GetTroubleshootingResultSender sends the GetTroubleshootingResult request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGroupGetTroubleshootingResultFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -781,7 +781,7 @@ func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (
 
 // GetTroubleshootingResultResponder handles the response to the GetTroubleshootingResult request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -796,22 +796,22 @@ func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the VM to check security groups for.
-func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGroupGetVMSecurityRulesFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetVMSecurityRules", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetVMSecurityRules", err.Error())
 	}
 
 	req, err := client.GetVMSecurityRulesPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVMSecurityRulesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -819,7 +819,7 @@ func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGro
 }
 
 // GetVMSecurityRulesPreparer prepares the GetVMSecurityRules request.
-func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -843,7 +843,7 @@ func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, res
 
 // GetVMSecurityRulesSender sends the GetVMSecurityRules request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGroupGetVMSecurityRulesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -858,7 +858,7 @@ func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future
 
 // GetVMSecurityRulesResponder handles the response to the GetVMSecurityRules request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -872,30 +872,30 @@ func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (r
 // List gets all network watchers by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client WatchersClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client WatchersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -916,14 +916,14 @@ func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -935,30 +935,30 @@ func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherL
 }
 
 // ListAll gets all network watchers by subscription.
-func (client WatchersClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client WatchersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -978,14 +978,14 @@ func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1000,16 +1000,16 @@ func (client WatchersClient) ListAllResponder(resp *http.Response) (result Watch
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that scope the list of available providers.
-func (client WatchersClient) ListAvailableProviders(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (result WatchersListAvailableProvidersFuture, err error) {
+func (client WatchersGroupClient) ListAvailableProviders(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (result WatchersGroupListAvailableProvidersFuture, err error) {
 	req, err := client.ListAvailableProvidersPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAvailableProviders", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAvailableProviders", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListAvailableProvidersSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAvailableProviders", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAvailableProviders", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1017,7 +1017,7 @@ func (client WatchersClient) ListAvailableProviders(ctx context.Context, resourc
 }
 
 // ListAvailableProvidersPreparer prepares the ListAvailableProviders request.
-func (client WatchersClient) ListAvailableProvidersPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (*http.Request, error) {
+func (client WatchersGroupClient) ListAvailableProvidersPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1041,7 +1041,7 @@ func (client WatchersClient) ListAvailableProvidersPreparer(ctx context.Context,
 
 // ListAvailableProvidersSender sends the ListAvailableProviders request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListAvailableProvidersSender(req *http.Request) (future WatchersListAvailableProvidersFuture, err error) {
+func (client WatchersGroupClient) ListAvailableProvidersSender(req *http.Request) (future WatchersGroupListAvailableProvidersFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1056,7 +1056,7 @@ func (client WatchersClient) ListAvailableProvidersSender(req *http.Request) (fu
 
 // ListAvailableProvidersResponder handles the response to the ListAvailableProviders request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListAvailableProvidersResponder(resp *http.Response) (result AvailableProvidersList, err error) {
+func (client WatchersGroupClient) ListAvailableProvidersResponder(resp *http.Response) (result AvailableProvidersList, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1071,7 +1071,7 @@ func (client WatchersClient) ListAvailableProvidersResponder(resp *http.Response
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define the configuration of flow log.
-func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -1079,18 +1079,18 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 					Chain: []validation.Constraint{{Target: "parameters.FlowLogProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.FlowLogProperties.Enabled", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "SetFlowLogConfiguration", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "SetFlowLogConfiguration", err.Error())
 	}
 
 	req, err := client.SetFlowLogConfigurationPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetFlowLogConfigurationSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1098,7 +1098,7 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 }
 
 // SetFlowLogConfigurationPreparer prepares the SetFlowLogConfiguration request.
-func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1122,7 +1122,7 @@ func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context
 
 // SetFlowLogConfigurationSender sends the SetFlowLogConfiguration request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1137,7 +1137,7 @@ func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (f
 
 // SetFlowLogConfigurationResponder handles the response to the SetFlowLogConfiguration request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1152,30 +1152,30 @@ func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Respons
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters supplied to update network watcher tags.
-func (client WatchersClient) UpdateTags(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (result Watcher, err error) {
+func (client WatchersGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (result Watcher, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.UpdateTagsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "UpdateTags", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "UpdateTags", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "UpdateTags", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "UpdateTags", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client WatchersClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (*http.Request, error) {
+func (client WatchersGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1199,14 +1199,14 @@ func (client WatchersClient) UpdateTagsPreparer(ctx context.Context, resourceGro
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) UpdateTagsSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) UpdateTagsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) UpdateTagsResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) UpdateTagsResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1221,7 +1221,7 @@ func (client WatchersClient) UpdateTagsResponder(resp *http.Response) (result Wa
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the IP flow to be verified.
-func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersGroupVerifyIPFlowFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -1229,18 +1229,18 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 				{Target: "parameters.RemotePort", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.LocalIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.RemoteIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "VerifyIPFlow", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "VerifyIPFlow", err.Error())
 	}
 
 	req, err := client.VerifyIPFlowPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.VerifyIPFlowSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1248,7 +1248,7 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 }
 
 // VerifyIPFlowPreparer prepares the VerifyIPFlow request.
-func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
+func (client WatchersGroupClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1272,7 +1272,7 @@ func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceG
 
 // VerifyIPFlowSender sends the VerifyIPFlow request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlowSender(req *http.Request) (future WatchersGroupVerifyIPFlowFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1287,7 +1287,7 @@ func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future Watch
 
 // VerifyIPFlowResponder handles the response to the VerifyIPFlow request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
+func (client WatchersGroupClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/applicationgateways.go b/services/network/mgmt/2017-10-01/network/applicationgatewaysgroup.go
similarity index 71%
rename from services/network/mgmt/2017-10-01/network/applicationgateways.go
rename to services/network/mgmt/2017-10-01/network/applicationgatewaysgroup.go
index b13f8a90c06f..f34f9c9f8f56 100644
--- a/services/network/mgmt/2017-10-01/network/applicationgateways.go
+++ b/services/network/mgmt/2017-10-01/network/applicationgatewaysgroup.go
@@ -25,35 +25,35 @@ import (
 	"net/http"
 )
 
-// ApplicationGatewaysClient is the network Client
-type ApplicationGatewaysClient struct {
+// ApplicationGatewaysGroupClient is the network Client
+type ApplicationGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewApplicationGatewaysClient creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
-	return NewApplicationGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewApplicationGatewaysGroupClient creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClient(subscriptionID string) ApplicationGatewaysGroupClient {
+	return NewApplicationGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewApplicationGatewaysClientWithBaseURI creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
-	return ApplicationGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewApplicationGatewaysGroupClientWithBaseURI creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysGroupClient {
+	return ApplicationGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // BackendHealth gets the backend health of the specified application gateway in a resource group.
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. expand is expands BackendAddressPool and BackendHttpSettings referenced in backend health.
-func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	req, err := client.BackendHealthPreparer(ctx, resourceGroupName, applicationGatewayName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.BackendHealthSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resou
 }
 
 // BackendHealthPreparer prepares the BackendHealth request.
-func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Contex
 
 // BackendHealthSender sends the BackendHealth request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (
 
 // BackendHealthResponder handles the response to the BackendHealth request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,7 +116,7 @@ func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. parameters is parameters supplied to the create or update application gateway operation.
-func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ApplicationGatewayPropertiesFormat", Name: validation.Null, Rule: false,
@@ -126,18 +126,18 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 						{Target: "parameters.ApplicationGatewayPropertiesFormat.WebApplicationFirewallConfiguration.RuleSetVersion", Name: validation.Null, Rule: true, Chain: nil},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ApplicationGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ApplicationGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -145,7 +145,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -169,7 +169,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +184,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -199,16 +199,16 @@ func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -216,7 +216,7 @@ func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGrou
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -238,7 +238,7 @@ func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, reso
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteSender(req *http.Request) (future ApplicationGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -253,7 +253,7 @@ func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -267,30 +267,30 @@ func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -312,14 +312,14 @@ func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourc
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (resul
 // GetSslPredefinedPolicy gets Ssl predefined policy with the specified policy name.
 //
 // predefinedPolicyName is name of Ssl predefined policy.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	req, err := client.GetSslPredefinedPolicyPreparer(ctx, predefinedPolicyName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSslPredefinedPolicySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSslPredefinedPolicyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSslPredefinedPolicyPreparer prepares the GetSslPredefinedPolicy request.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"predefinedPolicyName": autorest.Encode("path", predefinedPolicyName),
 		"subscriptionId":       autorest.Encode("path", client.SubscriptionID),
@@ -377,14 +377,14 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx conte
 
 // GetSslPredefinedPolicySender sends the GetSslPredefinedPolicy request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSslPredefinedPolicyResponder handles the response to the GetSslPredefinedPolicy request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -398,31 +398,31 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *ht
 // List lists all application gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ApplicationGatewaysClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -443,14 +443,14 @@ func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resour
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -462,10 +462,10 @@ func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (resu
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -473,47 +473,47 @@ func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationG
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the application gateways in a subscription.
-func (client ApplicationGatewaysClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -533,14 +533,14 @@ func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*h
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -552,10 +552,10 @@ func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (r
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -563,46 +563,46 @@ func (client ApplicationGatewaysClient) listAllNextResults(lastResults Applicati
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
 
 // ListAvailableSslOptions lists available Ssl options for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
 	req, err := client.ListAvailableSslOptionsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslOptionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableSslOptionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslOptionsPreparer prepares the ListAvailableSslOptions request.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -622,14 +622,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx cont
 
 // ListAvailableSslOptionsSender sends the ListAvailableSslOptions request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslOptionsResponder handles the response to the ListAvailableSslOptions request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -641,31 +641,31 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *h
 }
 
 // ListAvailableSslPredefinedPolicies lists all SSL predefined policies for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
 	result.fn = client.listAvailableSslPredefinedPoliciesNextResults
 	req, err := client.ListAvailableSslPredefinedPoliciesPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.agaspp.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
 		return
 	}
 
 	result.agaspp, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesPreparer prepares the ListAvailableSslPredefinedPolicies request.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -685,14 +685,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPrepar
 
 // ListAvailableSslPredefinedPoliciesSender sends the ListAvailableSslPredefinedPolicies request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslPredefinedPoliciesResponder handles the response to the ListAvailableSslPredefinedPolicies request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -704,10 +704,10 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesRespon
 }
 
 // listAvailableSslPredefinedPoliciesNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	req, err := lastResults.applicationGatewayAvailableSslPredefinedPoliciesPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -715,46 +715,46 @@ func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextRe
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
 	result.page, err = client.ListAvailableSslPredefinedPolicies(ctx)
 	return
 }
 
 // ListAvailableWafRuleSets lists all available web application firewall rule sets.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	req, err := client.ListAvailableWafRuleSetsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableWafRuleSetsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableWafRuleSetsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableWafRuleSetsPreparer prepares the ListAvailableWafRuleSets request.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -774,14 +774,14 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx con
 
 // ListAvailableWafRuleSetsSender sends the ListAvailableWafRuleSets request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableWafRuleSetsResponder handles the response to the ListAvailableWafRuleSets request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -796,16 +796,16 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStartFuture, err error) {
 	req, err := client.StartPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StartSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -813,7 +813,7 @@ func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroup
 }
 
 // StartPreparer prepares the Start request.
-func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -835,7 +835,7 @@ func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resou
 
 // StartSender sends the Start request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StartSender(req *http.Request) (future ApplicationGatewaysGroupStartFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -850,7 +850,7 @@ func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future A
 
 // StartResponder handles the response to the Start request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -864,16 +864,16 @@ func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -881,7 +881,7 @@ func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupN
 }
 
 // StopPreparer prepares the Stop request.
-func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -903,7 +903,7 @@ func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resour
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StopSender(req *http.Request) (future ApplicationGatewaysGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -918,7 +918,7 @@ func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future Ap
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -932,16 +932,16 @@ func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. parameters is parameters supplied to update application gateway tags.
-func (client ApplicationGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (result ApplicationGatewaysUpdateTagsFuture, err error) {
+func (client ApplicationGatewaysGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (result ApplicationGatewaysGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, applicationGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -949,7 +949,7 @@ func (client ApplicationGatewaysClient) UpdateTags(ctx context.Context, resource
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client ApplicationGatewaysClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -973,7 +973,7 @@ func (client ApplicationGatewaysClient) UpdateTagsPreparer(ctx context.Context,
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) UpdateTagsSender(req *http.Request) (future ApplicationGatewaysUpdateTagsFuture, err error) {
+func (client ApplicationGatewaysGroupClient) UpdateTagsSender(req *http.Request) (future ApplicationGatewaysGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -988,7 +988,7 @@ func (client ApplicationGatewaysClient) UpdateTagsSender(req *http.Request) (fut
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) UpdateTagsResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) UpdateTagsResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/applicationsecuritygroups.go b/services/network/mgmt/2017-10-01/network/applicationsecuritygroupsgroup.go
similarity index 68%
rename from services/network/mgmt/2017-10-01/network/applicationsecuritygroups.go
rename to services/network/mgmt/2017-10-01/network/applicationsecuritygroupsgroup.go
index 98e0f6a42dde..321115be8238 100644
--- a/services/network/mgmt/2017-10-01/network/applicationsecuritygroups.go
+++ b/services/network/mgmt/2017-10-01/network/applicationsecuritygroupsgroup.go
@@ -24,35 +24,36 @@ import (
 	"net/http"
 )
 
-// ApplicationSecurityGroupsClient is the network Client
-type ApplicationSecurityGroupsClient struct {
+// ApplicationSecurityGroupsGroupClient is the network Client
+type ApplicationSecurityGroupsGroupClient struct {
 	BaseClient
 }
 
-// NewApplicationSecurityGroupsClient creates an instance of the ApplicationSecurityGroupsClient client.
-func NewApplicationSecurityGroupsClient(subscriptionID string) ApplicationSecurityGroupsClient {
-	return NewApplicationSecurityGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewApplicationSecurityGroupsGroupClient creates an instance of the ApplicationSecurityGroupsGroupClient client.
+func NewApplicationSecurityGroupsGroupClient(subscriptionID string) ApplicationSecurityGroupsGroupClient {
+	return NewApplicationSecurityGroupsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewApplicationSecurityGroupsClientWithBaseURI creates an instance of the ApplicationSecurityGroupsClient client.
-func NewApplicationSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsClient {
-	return ApplicationSecurityGroupsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewApplicationSecurityGroupsGroupClientWithBaseURI creates an instance of the ApplicationSecurityGroupsGroupClient
+// client.
+func NewApplicationSecurityGroupsGroupClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsGroupClient {
+	return ApplicationSecurityGroupsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an application security group.
 //
 // resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application
 // security group. parameters is parameters supplied to the create or update ApplicationSecurityGroup operation.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (result ApplicationSecurityGroupsCreateOrUpdateFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (result ApplicationSecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +61,7 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdate(ctx context.Context
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationSecurityGroupName": autorest.Encode("path", applicationSecurityGroupName),
 		"resourceGroupName":            autorest.Encode("path", resourceGroupName),
@@ -84,7 +85,7 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdatePreparer(ctx context
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future ApplicationSecurityGroupsCreateOrUpdateFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdateSender(req *http.Request) (future ApplicationSecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +100,7 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdateSender(req *http.Req
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -114,16 +115,16 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdateResponder(resp *http
 //
 // resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application
 // security group.
-func (client ApplicationSecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroupsDeleteFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) Delete(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroupsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, applicationSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -131,7 +132,7 @@ func (client ApplicationSecurityGroupsClient) Delete(ctx context.Context, resour
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ApplicationSecurityGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationSecurityGroupName": autorest.Encode("path", applicationSecurityGroupName),
 		"resourceGroupName":            autorest.Encode("path", resourceGroupName),
@@ -153,7 +154,7 @@ func (client ApplicationSecurityGroupsClient) DeletePreparer(ctx context.Context
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) DeleteSender(req *http.Request) (future ApplicationSecurityGroupsDeleteFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) DeleteSender(req *http.Request) (future ApplicationSecurityGroupsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -168,7 +169,7 @@ func (client ApplicationSecurityGroupsClient) DeleteSender(req *http.Request) (f
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationSecurityGroupsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -182,30 +183,30 @@ func (client ApplicationSecurityGroupsClient) DeleteResponder(resp *http.Respons
 //
 // resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application
 // security group.
-func (client ApplicationSecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroup, err error) {
+func (client ApplicationSecurityGroupsGroupClient) Get(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroup, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, applicationSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ApplicationSecurityGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationSecurityGroupName": autorest.Encode("path", applicationSecurityGroupName),
 		"resourceGroupName":            autorest.Encode("path", resourceGroupName),
@@ -227,14 +228,14 @@ func (client ApplicationSecurityGroupsClient) GetPreparer(ctx context.Context, r
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationSecurityGroupsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) GetResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
+func (client ApplicationSecurityGroupsGroupClient) GetResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -248,31 +249,31 @@ func (client ApplicationSecurityGroupsClient) GetResponder(resp *http.Response)
 // List gets all the application security groups in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ApplicationSecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultPage, err error) {
+func (client ApplicationSecurityGroupsGroupClient) List(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.asglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.asglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ApplicationSecurityGroupsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -293,14 +294,14 @@ func (client ApplicationSecurityGroupsClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) ListResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -312,10 +313,10 @@ func (client ApplicationSecurityGroupsClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ApplicationSecurityGroupsClient) listNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) listNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
 	req, err := lastResults.applicationSecurityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -323,47 +324,47 @@ func (client ApplicationSecurityGroupsClient) listNextResults(lastResults Applic
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationSecurityGroupsClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultIterator, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all application security groups in a subscription.
-func (client ApplicationSecurityGroupsClient) ListAll(ctx context.Context) (result ApplicationSecurityGroupListResultPage, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAll(ctx context.Context) (result ApplicationSecurityGroupListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.asglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.asglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ApplicationSecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -383,14 +384,14 @@ func (client ApplicationSecurityGroupsClient) ListAllPreparer(ctx context.Contex
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) ListAllResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -402,10 +403,10 @@ func (client ApplicationSecurityGroupsClient) ListAllResponder(resp *http.Respon
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ApplicationSecurityGroupsClient) listAllNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) listAllNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
 	req, err := lastResults.applicationSecurityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -413,17 +414,17 @@ func (client ApplicationSecurityGroupsClient) listAllNextResults(lastResults App
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationSecurityGroupsClient) ListAllComplete(ctx context.Context) (result ApplicationSecurityGroupListResultIterator, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllComplete(ctx context.Context) (result ApplicationSecurityGroupListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/availableendpointservices.go b/services/network/mgmt/2017-10-01/network/availableendpointservicesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-10-01/network/availableendpointservices.go
rename to services/network/mgmt/2017-10-01/network/availableendpointservicesgroup.go
index c82f3ab810a6..b37a7af4d7a0 100644
--- a/services/network/mgmt/2017-10-01/network/availableendpointservices.go
+++ b/services/network/mgmt/2017-10-01/network/availableendpointservicesgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// AvailableEndpointServicesClient is the network Client
-type AvailableEndpointServicesClient struct {
+// AvailableEndpointServicesGroupClient is the network Client
+type AvailableEndpointServicesGroupClient struct {
 	BaseClient
 }
 
-// NewAvailableEndpointServicesClient creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClient(subscriptionID string) AvailableEndpointServicesClient {
-	return NewAvailableEndpointServicesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewAvailableEndpointServicesGroupClient creates an instance of the AvailableEndpointServicesGroupClient client.
+func NewAvailableEndpointServicesGroupClient(subscriptionID string) AvailableEndpointServicesGroupClient {
+	return NewAvailableEndpointServicesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewAvailableEndpointServicesClientWithBaseURI creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesClient {
-	return AvailableEndpointServicesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewAvailableEndpointServicesGroupClientWithBaseURI creates an instance of the AvailableEndpointServicesGroupClient
+// client.
+func NewAvailableEndpointServicesGroupClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesGroupClient {
+	return AvailableEndpointServicesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list what values of endpoint services are available for use.
 //
 // location is the location to check available endpoint services.
-func (client AvailableEndpointServicesClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
+func (client AvailableEndpointServicesGroupClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.eslr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.eslr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client AvailableEndpointServicesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -87,14 +88,14 @@ func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client AvailableEndpointServicesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client AvailableEndpointServicesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -106,10 +107,10 @@ func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client AvailableEndpointServicesClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
 	req, err := lastResults.endpointServicesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -117,17 +118,17 @@ func (client AvailableEndpointServicesClient) listNextResults(lastResults Endpoi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client AvailableEndpointServicesClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
+func (client AvailableEndpointServicesGroupClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/bgpservicecommunities.go b/services/network/mgmt/2017-10-01/network/bgpservicecommunitiesgroup.go
similarity index 63%
rename from services/network/mgmt/2017-10-01/network/bgpservicecommunities.go
rename to services/network/mgmt/2017-10-01/network/bgpservicecommunitiesgroup.go
index 949c28af54ee..e0cade074d92 100644
--- a/services/network/mgmt/2017-10-01/network/bgpservicecommunities.go
+++ b/services/network/mgmt/2017-10-01/network/bgpservicecommunitiesgroup.go
@@ -24,47 +24,47 @@ import (
 	"net/http"
 )
 
-// BgpServiceCommunitiesClient is the network Client
-type BgpServiceCommunitiesClient struct {
+// BgpServiceCommunitiesGroupClient is the network Client
+type BgpServiceCommunitiesGroupClient struct {
 	BaseClient
 }
 
-// NewBgpServiceCommunitiesClient creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
-	return NewBgpServiceCommunitiesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewBgpServiceCommunitiesGroupClient creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClient(subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return NewBgpServiceCommunitiesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewBgpServiceCommunitiesClientWithBaseURI creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
-	return BgpServiceCommunitiesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewBgpServiceCommunitiesGroupClientWithBaseURI creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return BgpServiceCommunitiesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available bgp service communities.
-func (client BgpServiceCommunitiesClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
+func (client BgpServiceCommunitiesGroupClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.bsclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.bsclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client BgpServiceCommunitiesGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -84,14 +84,14 @@ func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*ht
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client BgpServiceCommunitiesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client BgpServiceCommunitiesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -103,10 +103,10 @@ func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
 	req, err := lastResults.bgpServiceCommunityListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -114,17 +114,17 @@ func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpService
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client BgpServiceCommunitiesClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/client.go b/services/network/mgmt/2017-10-01/network/client.go
index ecb5ac25c7ff..c94ce1ee38a6 100644
--- a/services/network/mgmt/2017-10-01/network/client.go
+++ b/services/network/mgmt/2017-10-01/network/client.go
@@ -21,10 +21,7 @@ package network
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 
 import (
-	"context"
 	"github.com/Azure/go-autorest/autorest"
-	"github.com/Azure/go-autorest/autorest/azure"
-	"net/http"
 )
 
 const (
@@ -52,70 +49,3 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
 		SubscriptionID: subscriptionID,
 	}
 }
-
-// CheckDNSNameAvailability checks whether a domain name in the cloudapp.azure.com zone is available for use.
-//
-// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
-// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
-func (client BaseClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
-	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
-		return
-	}
-
-	resp, err := client.CheckDNSNameAvailabilitySender(req)
-	if err != nil {
-		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure sending request")
-		return
-	}
-
-	result, err = client.CheckDNSNameAvailabilityResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
-	}
-
-	return
-}
-
-// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
-func (client BaseClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
-	pathParameters := map[string]interface{}{
-		"location":       autorest.Encode("path", location),
-		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
-	}
-
-	const APIVersion = "2017-10-01"
-	queryParameters := map[string]interface{}{
-		"api-version":     APIVersion,
-		"domainNameLabel": autorest.Encode("query", domainNameLabel),
-	}
-
-	preparer := autorest.CreatePreparer(
-		autorest.AsGet(),
-		autorest.WithBaseURL(client.BaseURI),
-		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
-		autorest.WithQueryParameters(queryParameters))
-	return preparer.Prepare((&http.Request{}).WithContext(ctx))
-}
-
-// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
-// http.Response Body if it receives an error.
-func (client BaseClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
-	return autorest.SendWithSender(client, req,
-		azure.DoRetryWithRegistration(client.Client))
-}
-
-// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
-// closes the http.Response Body.
-func (client BaseClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
-	err = autorest.Respond(
-		resp,
-		client.ByInspecting(),
-		azure.WithErrorUnlessStatusCode(http.StatusOK),
-		autorest.ByUnmarshallingJSON(&result),
-		autorest.ByClosing())
-	result.Response = autorest.Response{Response: resp}
-	return
-}
diff --git a/services/network/mgmt/2017-10-01/network/connectionmonitors.go b/services/network/mgmt/2017-10-01/network/connectionmonitorsgroup.go
similarity index 74%
rename from services/network/mgmt/2017-10-01/network/connectionmonitors.go
rename to services/network/mgmt/2017-10-01/network/connectionmonitorsgroup.go
index aac169415357..bcf17ab00e3c 100644
--- a/services/network/mgmt/2017-10-01/network/connectionmonitors.go
+++ b/services/network/mgmt/2017-10-01/network/connectionmonitorsgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// ConnectionMonitorsClient is the network Client
-type ConnectionMonitorsClient struct {
+// ConnectionMonitorsGroupClient is the network Client
+type ConnectionMonitorsGroupClient struct {
 	BaseClient
 }
 
-// NewConnectionMonitorsClient creates an instance of the ConnectionMonitorsClient client.
-func NewConnectionMonitorsClient(subscriptionID string) ConnectionMonitorsClient {
-	return NewConnectionMonitorsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewConnectionMonitorsGroupClient creates an instance of the ConnectionMonitorsGroupClient client.
+func NewConnectionMonitorsGroupClient(subscriptionID string) ConnectionMonitorsGroupClient {
+	return NewConnectionMonitorsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewConnectionMonitorsClientWithBaseURI creates an instance of the ConnectionMonitorsClient client.
-func NewConnectionMonitorsClientWithBaseURI(baseURI string, subscriptionID string) ConnectionMonitorsClient {
-	return ConnectionMonitorsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewConnectionMonitorsGroupClientWithBaseURI creates an instance of the ConnectionMonitorsGroupClient client.
+func NewConnectionMonitorsGroupClientWithBaseURI(baseURI string, subscriptionID string) ConnectionMonitorsGroupClient {
+	return ConnectionMonitorsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate create or update a connection monitor.
@@ -45,7 +45,7 @@ func NewConnectionMonitorsClientWithBaseURI(baseURI string, subscriptionID strin
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor. parameters is
 // parameters that define the operation to create a connection monitor.
-func (client ConnectionMonitorsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string, parameters ConnectionMonitor) (result ConnectionMonitorsCreateOrUpdateFuture, err error) {
+func (client ConnectionMonitorsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string, parameters ConnectionMonitor) (result ConnectionMonitorsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ConnectionMonitorParameters", Name: validation.Null, Rule: true,
@@ -53,18 +53,18 @@ func (client ConnectionMonitorsClient) CreateOrUpdate(ctx context.Context, resou
 					Chain: []validation.Constraint{{Target: "parameters.ConnectionMonitorParameters.Source.ResourceID", Name: validation.Null, Rule: true, Chain: nil}}},
 					{Target: "parameters.ConnectionMonitorParameters.Destination", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ConnectionMonitorsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ConnectionMonitorsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -72,7 +72,7 @@ func (client ConnectionMonitorsClient) CreateOrUpdate(ctx context.Context, resou
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ConnectionMonitorsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string, parameters ConnectionMonitor) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string, parameters ConnectionMonitor) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -97,7 +97,7 @@ func (client ConnectionMonitorsClient) CreateOrUpdatePreparer(ctx context.Contex
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) CreateOrUpdateSender(req *http.Request) (future ConnectionMonitorsCreateOrUpdateFuture, err error) {
+func (client ConnectionMonitorsGroupClient) CreateOrUpdateSender(req *http.Request) (future ConnectionMonitorsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -112,7 +112,7 @@ func (client ConnectionMonitorsClient) CreateOrUpdateSender(req *http.Request) (
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) CreateOrUpdateResponder(resp *http.Response) (result ConnectionMonitorResult, err error) {
+func (client ConnectionMonitorsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ConnectionMonitorResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -127,16 +127,16 @@ func (client ConnectionMonitorsClient) CreateOrUpdateResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor.
-func (client ConnectionMonitorsClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsDeleteFuture, err error) {
+func (client ConnectionMonitorsGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -144,7 +144,7 @@ func (client ConnectionMonitorsClient) Delete(ctx context.Context, resourceGroup
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ConnectionMonitorsClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -167,7 +167,7 @@ func (client ConnectionMonitorsClient) DeletePreparer(ctx context.Context, resou
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) DeleteSender(req *http.Request) (future ConnectionMonitorsDeleteFuture, err error) {
+func (client ConnectionMonitorsGroupClient) DeleteSender(req *http.Request) (future ConnectionMonitorsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -182,7 +182,7 @@ func (client ConnectionMonitorsClient) DeleteSender(req *http.Request) (future C
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ConnectionMonitorsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -196,30 +196,30 @@ func (client ConnectionMonitorsClient) DeleteResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor.
-func (client ConnectionMonitorsClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorResult, err error) {
+func (client ConnectionMonitorsGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorResult, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ConnectionMonitorsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -242,14 +242,14 @@ func (client ConnectionMonitorsClient) GetPreparer(ctx context.Context, resource
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ConnectionMonitorsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) GetResponder(resp *http.Response) (result ConnectionMonitorResult, err error) {
+func (client ConnectionMonitorsGroupClient) GetResponder(resp *http.Response) (result ConnectionMonitorResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -264,30 +264,30 @@ func (client ConnectionMonitorsClient) GetResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource.
-func (client ConnectionMonitorsClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result ConnectionMonitorListResult, err error) {
+func (client ConnectionMonitorsGroupClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result ConnectionMonitorListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ConnectionMonitorsClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -309,14 +309,14 @@ func (client ConnectionMonitorsClient) ListPreparer(ctx context.Context, resourc
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ConnectionMonitorsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) ListResponder(resp *http.Response) (result ConnectionMonitorListResult, err error) {
+func (client ConnectionMonitorsGroupClient) ListResponder(resp *http.Response) (result ConnectionMonitorListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -331,16 +331,16 @@ func (client ConnectionMonitorsClient) ListResponder(resp *http.Response) (resul
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name given to the connection monitor.
-func (client ConnectionMonitorsClient) Query(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsQueryFuture, err error) {
+func (client ConnectionMonitorsGroupClient) Query(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsGroupQueryFuture, err error) {
 	req, err := client.QueryPreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Query", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Query", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.QuerySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Query", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Query", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -348,7 +348,7 @@ func (client ConnectionMonitorsClient) Query(ctx context.Context, resourceGroupN
 }
 
 // QueryPreparer prepares the Query request.
-func (client ConnectionMonitorsClient) QueryPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) QueryPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -371,7 +371,7 @@ func (client ConnectionMonitorsClient) QueryPreparer(ctx context.Context, resour
 
 // QuerySender sends the Query request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) QuerySender(req *http.Request) (future ConnectionMonitorsQueryFuture, err error) {
+func (client ConnectionMonitorsGroupClient) QuerySender(req *http.Request) (future ConnectionMonitorsGroupQueryFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -386,7 +386,7 @@ func (client ConnectionMonitorsClient) QuerySender(req *http.Request) (future Co
 
 // QueryResponder handles the response to the Query request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) QueryResponder(resp *http.Response) (result ConnectionMonitorQueryResult, err error) {
+func (client ConnectionMonitorsGroupClient) QueryResponder(resp *http.Response) (result ConnectionMonitorQueryResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -401,16 +401,16 @@ func (client ConnectionMonitorsClient) QueryResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor.
-func (client ConnectionMonitorsClient) Start(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsStartFuture, err error) {
+func (client ConnectionMonitorsGroupClient) Start(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsGroupStartFuture, err error) {
 	req, err := client.StartPreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Start", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Start", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StartSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Start", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Start", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -418,7 +418,7 @@ func (client ConnectionMonitorsClient) Start(ctx context.Context, resourceGroupN
 }
 
 // StartPreparer prepares the Start request.
-func (client ConnectionMonitorsClient) StartPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) StartPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -441,7 +441,7 @@ func (client ConnectionMonitorsClient) StartPreparer(ctx context.Context, resour
 
 // StartSender sends the Start request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) StartSender(req *http.Request) (future ConnectionMonitorsStartFuture, err error) {
+func (client ConnectionMonitorsGroupClient) StartSender(req *http.Request) (future ConnectionMonitorsGroupStartFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -456,7 +456,7 @@ func (client ConnectionMonitorsClient) StartSender(req *http.Request) (future Co
 
 // StartResponder handles the response to the Start request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ConnectionMonitorsGroupClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -470,16 +470,16 @@ func (client ConnectionMonitorsClient) StartResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor.
-func (client ConnectionMonitorsClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsStopFuture, err error) {
+func (client ConnectionMonitorsGroupClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -487,7 +487,7 @@ func (client ConnectionMonitorsClient) Stop(ctx context.Context, resourceGroupNa
 }
 
 // StopPreparer prepares the Stop request.
-func (client ConnectionMonitorsClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -510,7 +510,7 @@ func (client ConnectionMonitorsClient) StopPreparer(ctx context.Context, resourc
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) StopSender(req *http.Request) (future ConnectionMonitorsStopFuture, err error) {
+func (client ConnectionMonitorsGroupClient) StopSender(req *http.Request) (future ConnectionMonitorsGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -525,7 +525,7 @@ func (client ConnectionMonitorsClient) StopSender(req *http.Request) (future Con
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ConnectionMonitorsGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/defaultsecurityrules.go b/services/network/mgmt/2017-10-01/network/defaultsecurityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-10-01/network/defaultsecurityrules.go
rename to services/network/mgmt/2017-10-01/network/defaultsecurityrulesgroup.go
index 735c60e7ff7f..ef8979dda4c3 100644
--- a/services/network/mgmt/2017-10-01/network/defaultsecurityrules.go
+++ b/services/network/mgmt/2017-10-01/network/defaultsecurityrulesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// DefaultSecurityRulesClient is the network Client
-type DefaultSecurityRulesClient struct {
+// DefaultSecurityRulesGroupClient is the network Client
+type DefaultSecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewDefaultSecurityRulesClient creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClient(subscriptionID string) DefaultSecurityRulesClient {
-	return NewDefaultSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewDefaultSecurityRulesGroupClient creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClient(subscriptionID string) DefaultSecurityRulesGroupClient {
+	return NewDefaultSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewDefaultSecurityRulesClientWithBaseURI creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesClient {
-	return DefaultSecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewDefaultSecurityRulesGroupClientWithBaseURI creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesGroupClient {
+	return DefaultSecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get get the specified default network security rule.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. defaultSecurityRuleName is the name of the default security rule.
-func (client DefaultSecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"defaultSecurityRuleName":  autorest.Encode("path", defaultSecurityRuleName),
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
@@ -89,14 +89,14 @@ func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +111,31 @@ func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client DefaultSecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client DefaultSecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -157,14 +157,14 @@ func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +176,10 @@ func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +187,17 @@ func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client DefaultSecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client DefaultSecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/expressroutecircuitauthorizations.go b/services/network/mgmt/2017-10-01/network/expressroutecircuitauthorizationsgroup.go
similarity index 67%
rename from services/network/mgmt/2017-10-01/network/expressroutecircuitauthorizations.go
rename to services/network/mgmt/2017-10-01/network/expressroutecircuitauthorizationsgroup.go
index 69e67797a8aa..62c15acb7fd4 100644
--- a/services/network/mgmt/2017-10-01/network/expressroutecircuitauthorizations.go
+++ b/services/network/mgmt/2017-10-01/network/expressroutecircuitauthorizationsgroup.go
@@ -24,21 +24,21 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitAuthorizationsClient is the network Client
-type ExpressRouteCircuitAuthorizationsClient struct {
+// ExpressRouteCircuitAuthorizationsGroupClient is the network Client
+type ExpressRouteCircuitAuthorizationsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitAuthorizationsClient creates an instance of the ExpressRouteCircuitAuthorizationsClient
-// client.
-func NewExpressRouteCircuitAuthorizationsClient(subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return NewExpressRouteCircuitAuthorizationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitAuthorizationsGroupClient creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClient(subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitAuthorizationsClientWithBaseURI creates an instance of the
-// ExpressRouteCircuitAuthorizationsClient client.
-func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return ExpressRouteCircuitAuthorizationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return ExpressRouteCircuitAuthorizationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an authorization in the specified express route circuit.
@@ -46,16 +46,16 @@ func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subsc
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization. authorizationParameters is parameters supplied to the create
 // or update express route circuit authorization operation.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, authorizationName, authorizationParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -63,7 +63,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -88,7 +88,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -103,7 +103,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -118,16 +118,16 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(re
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -135,7 +135,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -158,7 +158,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -173,7 +173,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Req
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -187,30 +187,30 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -233,14 +233,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Co
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -254,31 +254,31 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Re
 // List gets all authorizations in an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit.
-func (client ExpressRouteCircuitAuthorizationsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.alr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.alr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -300,14 +300,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.C
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -319,10 +319,10 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.R
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
 	req, err := lastResults.authorizationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -330,17 +330,17 @@ func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitAuthorizationsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/expressroutecircuitpeerings.go b/services/network/mgmt/2017-10-01/network/expressroutecircuitpeeringsgroup.go
similarity index 70%
rename from services/network/mgmt/2017-10-01/network/expressroutecircuitpeerings.go
rename to services/network/mgmt/2017-10-01/network/expressroutecircuitpeeringsgroup.go
index d0f7afee46c8..de9d89aaa85c 100644
--- a/services/network/mgmt/2017-10-01/network/expressroutecircuitpeerings.go
+++ b/services/network/mgmt/2017-10-01/network/expressroutecircuitpeeringsgroup.go
@@ -25,19 +25,20 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitPeeringsClient is the network Client
-type ExpressRouteCircuitPeeringsClient struct {
+// ExpressRouteCircuitPeeringsGroupClient is the network Client
+type ExpressRouteCircuitPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitPeeringsClient creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return NewExpressRouteCircuitPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitPeeringsGroupClient creates an instance of the ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClient(subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitPeeringsClientWithBaseURI creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return ExpressRouteCircuitPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitPeeringsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return ExpressRouteCircuitPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified express route circuits.
@@ -45,7 +46,7 @@ func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptio
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. peeringParameters is parameters supplied to the create or update express
 // route circuit peering operation.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: peeringParameters,
 			Constraints: []validation.Constraint{{Target: "peeringParameters.ExpressRouteCircuitPeeringPropertiesFormat", Name: validation.Null, Rule: false,
@@ -54,18 +55,18 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Conte
 						{Target: "peeringParameters.ExpressRouteCircuitPeeringPropertiesFormat.PeerASN", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, peeringName, peeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -73,7 +74,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Conte
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -98,7 +99,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -113,7 +114,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.R
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -128,16 +129,16 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -145,7 +146,7 @@ func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, reso
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -168,7 +169,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Conte
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -183,7 +184,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request)
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -197,30 +198,30 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -243,14 +244,14 @@ func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context,
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -264,31 +265,31 @@ func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response
 // List gets all peerings in a specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitPeeringsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ercplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ercplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -310,14 +311,14 @@ func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -329,10 +330,10 @@ func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Respons
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
 	req, err := lastResults.expressRouteCircuitPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -340,17 +341,17 @@ func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults Expr
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/expressroutecircuits.go b/services/network/mgmt/2017-10-01/network/expressroutecircuitsgroup.go
similarity index 72%
rename from services/network/mgmt/2017-10-01/network/expressroutecircuits.go
rename to services/network/mgmt/2017-10-01/network/expressroutecircuitsgroup.go
index 7e3c899207af..15b057406917 100644
--- a/services/network/mgmt/2017-10-01/network/expressroutecircuits.go
+++ b/services/network/mgmt/2017-10-01/network/expressroutecircuitsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitsClient is the network Client
-type ExpressRouteCircuitsClient struct {
+// ExpressRouteCircuitsGroupClient is the network Client
+type ExpressRouteCircuitsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitsClient creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
-	return NewExpressRouteCircuitsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitsGroupClient creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClient(subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return NewExpressRouteCircuitsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitsClientWithBaseURI creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
-	return ExpressRouteCircuitsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitsGroupClientWithBaseURI creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return ExpressRouteCircuitsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is
 // parameters supplied to the create or update express route circuit operation.
-func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Resp
 // Delete deletes the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -180,30 +180,30 @@ func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (r
 // Get gets information about the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of express route circuit.
-func (client ExpressRouteCircuitsClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -225,14 +225,14 @@ func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -247,30 +247,30 @@ func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitsClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetPeeringStatsPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetPeeringStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetPeeringStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPeeringStatsPreparer prepares the GetPeeringStats request.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -293,14 +293,14 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Con
 
 // GetPeeringStatsSender sends the GetPeeringStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetPeeringStatsResponder handles the response to the GetPeeringStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,30 +314,30 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Res
 // GetStats gets all the stats from an express route circuit in a resource group.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetStatsPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetStatsPreparer prepares the GetStats request.
-func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -359,14 +359,14 @@ func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, r
 
 // GetStatsSender sends the GetStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetStatsResponder handles the response to the GetStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -380,31 +380,31 @@ func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response)
 // List gets all the express route circuits in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ExpressRouteCircuitsClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -425,14 +425,14 @@ func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -444,10 +444,10 @@ func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -455,47 +455,47 @@ func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRout
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the express route circuits in a subscription.
-func (client ExpressRouteCircuitsClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -515,14 +515,14 @@ func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -534,10 +534,10 @@ func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -545,17 +545,17 @@ func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressR
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -564,16 +564,16 @@ func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (r
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	req, err := client.ListArpTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListArpTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -581,7 +581,7 @@ func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resou
 }
 
 // ListArpTablePreparer prepares the ListArpTable request.
-func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -605,7 +605,7 @@ func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Contex
 
 // ListArpTableSender sends the ListArpTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -620,7 +620,7 @@ func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (
 
 // ListArpTableResponder handles the response to the ListArpTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -636,16 +636,16 @@ func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	req, err := client.ListRoutesTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -653,7 +653,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, re
 }
 
 // ListRoutesTablePreparer prepares the ListRoutesTable request.
-func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -677,7 +677,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Con
 
 // ListRoutesTableSender sends the ListRoutesTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -692,7 +692,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request
 
 // ListRoutesTableResponder handles the response to the ListRoutesTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -708,16 +708,16 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	req, err := client.ListRoutesTableSummaryPreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSummarySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -725,7 +725,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Cont
 }
 
 // ListRoutesTableSummaryPreparer prepares the ListRoutesTableSummary request.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -749,7 +749,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx cont
 
 // ListRoutesTableSummarySender sends the ListRoutesTableSummary request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -764,7 +764,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.
 
 // ListRoutesTableSummaryResponder handles the response to the ListRoutesTableSummary request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -779,16 +779,16 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *h
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is
 // parameters supplied to update express route circuit tags.
-func (client ExpressRouteCircuitsClient) UpdateTags(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (result ExpressRouteCircuitsUpdateTagsFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (result ExpressRouteCircuitsGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, circuitName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -796,7 +796,7 @@ func (client ExpressRouteCircuitsClient) UpdateTags(ctx context.Context, resourc
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client ExpressRouteCircuitsClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -820,7 +820,7 @@ func (client ExpressRouteCircuitsClient) UpdateTagsPreparer(ctx context.Context,
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) UpdateTagsSender(req *http.Request) (future ExpressRouteCircuitsUpdateTagsFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTagsSender(req *http.Request) (future ExpressRouteCircuitsGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -835,7 +835,7 @@ func (client ExpressRouteCircuitsClient) UpdateTagsSender(req *http.Request) (fu
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) UpdateTagsResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTagsResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/expressrouteserviceproviders.go b/services/network/mgmt/2017-10-01/network/expressrouteserviceprovidersgroup.go
similarity index 61%
rename from services/network/mgmt/2017-10-01/network/expressrouteserviceproviders.go
rename to services/network/mgmt/2017-10-01/network/expressrouteserviceprovidersgroup.go
index 92972a44d123..9d09cd98ff16 100644
--- a/services/network/mgmt/2017-10-01/network/expressrouteserviceproviders.go
+++ b/services/network/mgmt/2017-10-01/network/expressrouteserviceprovidersgroup.go
@@ -24,48 +24,49 @@ import (
 	"net/http"
 )
 
-// ExpressRouteServiceProvidersClient is the network Client
-type ExpressRouteServiceProvidersClient struct {
+// ExpressRouteServiceProvidersGroupClient is the network Client
+type ExpressRouteServiceProvidersGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteServiceProvidersClient creates an instance of the ExpressRouteServiceProvidersClient client.
-func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
-	return NewExpressRouteServiceProvidersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteServiceProvidersGroupClient creates an instance of the ExpressRouteServiceProvidersGroupClient
+// client.
+func NewExpressRouteServiceProvidersGroupClient(subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return NewExpressRouteServiceProvidersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteServiceProvidersClientWithBaseURI creates an instance of the ExpressRouteServiceProvidersClient
-// client.
-func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
-	return ExpressRouteServiceProvidersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteServiceProvidersGroupClientWithBaseURI creates an instance of the
+// ExpressRouteServiceProvidersGroupClient client.
+func NewExpressRouteServiceProvidersGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return ExpressRouteServiceProvidersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available express route service providers.
-func (client ExpressRouteServiceProvidersClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ersplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ersplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -85,14 +86,14 @@ func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteServiceProvidersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -104,10 +105,10 @@ func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Respon
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
 	req, err := lastResults.expressRouteServiceProviderListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -115,17 +116,17 @@ func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults Exp
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteServiceProvidersClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/group.go b/services/network/mgmt/2017-10-01/network/group.go
new file mode 100644
index 000000000000..0de7fb887621
--- /dev/null
+++ b/services/network/mgmt/2017-10-01/network/group.go
@@ -0,0 +1,107 @@
+package network
+
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"context"
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"net/http"
+)
+
+// GroupClient is the network Client
+type GroupClient struct {
+	BaseClient
+}
+
+// NewGroupClient creates an instance of the GroupClient client.
+func NewGroupClient(subscriptionID string) GroupClient {
+	return NewGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
+}
+
+// NewGroupClientWithBaseURI creates an instance of the GroupClient client.
+func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
+	return GroupClient{NewWithBaseURI(baseURI, subscriptionID)}
+}
+
+// CheckDNSNameAvailability checks whether a domain name in the cloudapp.azure.com zone is available for use.
+//
+// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
+// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+func (client GroupClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
+	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := client.CheckDNSNameAvailabilitySender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure sending request")
+		return
+	}
+
+	result, err = client.CheckDNSNameAvailabilityResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
+	}
+
+	return
+}
+
+// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
+func (client GroupClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
+	pathParameters := map[string]interface{}{
+		"location":       autorest.Encode("path", location),
+		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
+	}
+
+	const APIVersion = "2017-10-01"
+	queryParameters := map[string]interface{}{
+		"api-version":     APIVersion,
+		"domainNameLabel": autorest.Encode("query", domainNameLabel),
+	}
+
+	preparer := autorest.CreatePreparer(
+		autorest.AsGet(),
+		autorest.WithBaseURL(client.BaseURI),
+		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
+		autorest.WithQueryParameters(queryParameters))
+	return preparer.Prepare((&http.Request{}).WithContext(ctx))
+}
+
+// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
+// http.Response Body if it receives an error.
+func (client GroupClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
+	return autorest.SendWithSender(client, req,
+		azure.DoRetryWithRegistration(client.Client))
+}
+
+// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
+// closes the http.Response Body.
+func (client GroupClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
+	err = autorest.Respond(
+		resp,
+		client.ByInspecting(),
+		azure.WithErrorUnlessStatusCode(http.StatusOK),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}
diff --git a/services/network/mgmt/2017-10-01/network/inboundnatrules.go b/services/network/mgmt/2017-10-01/network/inboundnatrulesgroup.go
similarity index 74%
rename from services/network/mgmt/2017-10-01/network/inboundnatrules.go
rename to services/network/mgmt/2017-10-01/network/inboundnatrulesgroup.go
index d3d10300be8c..c50be65dd8b8 100644
--- a/services/network/mgmt/2017-10-01/network/inboundnatrules.go
+++ b/services/network/mgmt/2017-10-01/network/inboundnatrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// InboundNatRulesClient is the network Client
-type InboundNatRulesClient struct {
+// InboundNatRulesGroupClient is the network Client
+type InboundNatRulesGroupClient struct {
 	BaseClient
 }
 
-// NewInboundNatRulesClient creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClient(subscriptionID string) InboundNatRulesClient {
-	return NewInboundNatRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInboundNatRulesGroupClient creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClient(subscriptionID string) InboundNatRulesGroupClient {
+	return NewInboundNatRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInboundNatRulesClientWithBaseURI creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesClient {
-	return InboundNatRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInboundNatRulesGroupClientWithBaseURI creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesGroupClient {
+	return InboundNatRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer inbound nat rule.
@@ -45,7 +45,7 @@ func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. inboundNatRuleParameters is parameters supplied to the
 // create or update inbound nat rule operation.
-func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: inboundNatRuleParameters,
 			Constraints: []validation.Constraint{{Target: "inboundNatRuleParameters.InboundNatRulePropertiesFormat", Name: validation.Null, Rule: false,
@@ -62,18 +62,18 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 						}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.InboundNatRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.InboundNatRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -81,7 +81,7 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -106,7 +106,7 @@ func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -121,7 +121,7 @@ func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -136,16 +136,16 @@ func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule.
-func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -153,7 +153,7 @@ func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -176,7 +176,7 @@ func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) DeleteSender(req *http.Request) (future InboundNatRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -191,7 +191,7 @@ func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future Inbo
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InboundNatRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -205,30 +205,30 @@ func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. expand is expands referenced resources.
-func (client InboundNatRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -254,14 +254,14 @@ func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -275,31 +275,31 @@ func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result In
 // List gets all the inbound nat rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client InboundNatRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
+func (client InboundNatRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.inrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.inrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -321,14 +321,14 @@ func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -340,10 +340,10 @@ func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result I
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
 	req, err := lastResults.inboundNatRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -351,17 +351,17 @@ func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InboundNatRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
+func (client InboundNatRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/interfaceipconfigurations.go b/services/network/mgmt/2017-10-01/network/interfaceipconfigurationsgroup.go
similarity index 66%
rename from services/network/mgmt/2017-10-01/network/interfaceipconfigurations.go
rename to services/network/mgmt/2017-10-01/network/interfaceipconfigurationsgroup.go
index 37863842cdab..90ce47ccf6a5 100644
--- a/services/network/mgmt/2017-10-01/network/interfaceipconfigurations.go
+++ b/services/network/mgmt/2017-10-01/network/interfaceipconfigurationsgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// InterfaceIPConfigurationsClient is the network Client
-type InterfaceIPConfigurationsClient struct {
+// InterfaceIPConfigurationsGroupClient is the network Client
+type InterfaceIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceIPConfigurationsClient creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClient(subscriptionID string) InterfaceIPConfigurationsClient {
-	return NewInterfaceIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceIPConfigurationsGroupClient creates an instance of the InterfaceIPConfigurationsGroupClient client.
+func NewInterfaceIPConfigurationsGroupClient(subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return NewInterfaceIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceIPConfigurationsClientWithBaseURI creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsClient {
-	return InterfaceIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceIPConfigurationsGroupClientWithBaseURI creates an instance of the InterfaceIPConfigurationsGroupClient
+// client.
+func NewInterfaceIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return InterfaceIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified network interface ip configuration.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // IPConfigurationName is the name of the ip configuration name.
-func (client InterfaceIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":  autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
@@ -89,14 +90,14 @@ func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, r
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +111,31 @@ func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response)
 // List get all ip configurations in a network interface
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
+func (client InterfaceIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.iiclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.iiclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -156,14 +157,14 @@ func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +176,10 @@ func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceIPConfigurationsClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
 	req, err := lastResults.interfaceIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +187,17 @@ func (client InterfaceIPConfigurationsClient) listNextResults(lastResults Interf
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/interfaceloadbalancers.go b/services/network/mgmt/2017-10-01/network/interfaceloadbalancersgroup.go
similarity index 63%
rename from services/network/mgmt/2017-10-01/network/interfaceloadbalancers.go
rename to services/network/mgmt/2017-10-01/network/interfaceloadbalancersgroup.go
index e685e9587cf4..dccf8fe80724 100644
--- a/services/network/mgmt/2017-10-01/network/interfaceloadbalancers.go
+++ b/services/network/mgmt/2017-10-01/network/interfaceloadbalancersgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// InterfaceLoadBalancersClient is the network Client
-type InterfaceLoadBalancersClient struct {
+// InterfaceLoadBalancersGroupClient is the network Client
+type InterfaceLoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceLoadBalancersClient creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClient(subscriptionID string) InterfaceLoadBalancersClient {
-	return NewInterfaceLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceLoadBalancersGroupClient creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClient(subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return NewInterfaceLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceLoadBalancersClientWithBaseURI creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersClient {
-	return InterfaceLoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceLoadBalancersGroupClientWithBaseURI creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return InterfaceLoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list all load balancers in a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceLoadBalancersClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
+func (client InterfaceLoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceLoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -88,14 +88,14 @@ func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceLoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceLoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -107,10 +107,10 @@ func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceLoadBalancersClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
 	req, err := lastResults.interfaceLoadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -118,17 +118,17 @@ func (client InterfaceLoadBalancersClient) listNextResults(lastResults Interface
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceLoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/interfaces.go b/services/network/mgmt/2017-10-01/network/interfacesgroup.go
similarity index 66%
rename from services/network/mgmt/2017-10-01/network/interfaces.go
rename to services/network/mgmt/2017-10-01/network/interfacesgroup.go
index 7fad7d56f4d4..3ed0eb103283 100644
--- a/services/network/mgmt/2017-10-01/network/interfaces.go
+++ b/services/network/mgmt/2017-10-01/network/interfacesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// InterfacesClient is the network Client
-type InterfacesClient struct {
+// InterfacesGroupClient is the network Client
+type InterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewInterfacesClient creates an instance of the InterfacesClient client.
-func NewInterfacesClient(subscriptionID string) InterfacesClient {
-	return NewInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfacesGroupClient creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClient(subscriptionID string) InterfacesGroupClient {
+	return NewInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfacesClientWithBaseURI creates an instance of the InterfacesClient client.
-func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
-	return InterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfacesGroupClientWithBaseURI creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfacesGroupClient {
+	return InterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // parameters is parameters supplied to the create or update network interface operation.
-func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkInterfaceName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroup
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
+func (client InterfacesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resou
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateSender(req *http.Request) (future InterfacesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future I
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (res
 // Delete deletes the specified network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName str
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroup
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) DeleteSender(req *http.Request) (future InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) DeleteSender(req *http.Request) (future InterfacesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client InterfacesClient) DeleteSender(req *http.Request) (future Interface
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InterfacesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client InterfacesClient) DeleteResponder(resp *http.Response) (result auto
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // expand is expands referenced resources.
-func (client InterfacesClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupNam
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,16 +250,16 @@ func (client InterfacesClient) GetResponder(resp *http.Response) (result Interfa
 // GetEffectiveRouteTable gets all route tables applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	req, err := client.GetEffectiveRouteTablePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetEffectiveRouteTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -267,7 +267,7 @@ func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resou
 }
 
 // GetEffectiveRouteTablePreparer prepares the GetEffectiveRouteTable request.
-func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -289,7 +289,7 @@ func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Contex
 
 // GetEffectiveRouteTableSender sends the GetEffectiveRouteTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -304,7 +304,7 @@ func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (
 
 // GetEffectiveRouteTableResponder handles the response to the GetEffectiveRouteTable request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -322,30 +322,30 @@ func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Respon
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. IPConfigurationName is the name of the ip configuration. expand is expands referenced
 // resources.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfiguration(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (result InterfaceIPConfiguration, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfiguration(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (result InterfaceIPConfiguration, err error) {
 	req, err := client.GetVirtualMachineScaleSetIPConfigurationPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetIPConfiguration", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetIPConfiguration", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetIPConfigurationSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetIPConfigurationResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetIPConfigurationPreparer prepares the GetVirtualMachineScaleSetIPConfiguration request.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfigurationPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -373,14 +373,14 @@ func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationPreparer(
 
 // GetVirtualMachineScaleSetIPConfigurationSender sends the GetVirtualMachineScaleSetIPConfiguration request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfigurationSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetIPConfigurationResponder handles the response to the GetVirtualMachineScaleSetIPConfiguration request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfigurationResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -396,30 +396,30 @@ func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationResponder
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. expand is expands referenced resources.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetNetworkInterfaceSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetNetworkInterfaceResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetNetworkInterfacePreparer prepares the GetVirtualMachineScaleSetNetworkInterface request.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
@@ -446,14 +446,14 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer
 
 // GetVirtualMachineScaleSetNetworkInterfaceSender sends the GetVirtualMachineScaleSetNetworkInterface request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetNetworkInterfaceResponder handles the response to the GetVirtualMachineScaleSetNetworkInterface request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -467,31 +467,31 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponde
 // List gets all network interfaces in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client InterfacesClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -512,14 +512,14 @@ func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupNa
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -531,10 +531,10 @@ func (client InterfacesClient) ListResponder(resp *http.Response) (result Interf
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -542,47 +542,47 @@ func (client InterfacesClient) listNextResults(lastResults InterfaceListResult)
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network interfaces in a subscription.
-func (client InterfacesClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client InterfacesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -602,14 +602,14 @@ func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Reque
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -621,10 +621,10 @@ func (client InterfacesClient) ListAllResponder(resp *http.Response) (result Int
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -632,17 +632,17 @@ func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResul
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -650,16 +650,16 @@ func (client InterfacesClient) ListAllComplete(ctx context.Context) (result Inte
 // ListEffectiveNetworkSecurityGroups gets all network security groups applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	req, err := client.ListEffectiveNetworkSecurityGroupsPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListEffectiveNetworkSecurityGroupsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -667,7 +667,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Co
 }
 
 // ListEffectiveNetworkSecurityGroupsPreparer prepares the ListEffectiveNetworkSecurityGroups request.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -689,7 +689,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx co
 
 // ListEffectiveNetworkSecurityGroupsSender sends the ListEffectiveNetworkSecurityGroups request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -704,7 +704,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *htt
 
 // ListEffectiveNetworkSecurityGroupsResponder handles the response to the ListEffectiveNetworkSecurityGroups request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -721,31 +721,31 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. expand is expands referenced resources.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurations(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurations(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetIPConfigurationsNextResults
 	req, err := client.ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetIPConfigurations", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetIPConfigurations", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetIPConfigurationsSender(req)
 	if err != nil {
 		result.iiclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure sending request")
 		return
 	}
 
 	result.iiclr, err = client.ListVirtualMachineScaleSetIPConfigurationsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetIPConfigurationsPreparer prepares the ListVirtualMachineScaleSetIPConfigurations request.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
@@ -772,14 +772,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsPrepare
 
 // ListVirtualMachineScaleSetIPConfigurationsSender sends the ListVirtualMachineScaleSetIPConfigurations request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetIPConfigurationsResponder handles the response to the ListVirtualMachineScaleSetIPConfigurations request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -791,10 +791,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsRespond
 }
 
 // listVirtualMachineScaleSetIPConfigurationsNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetIPConfigurationsNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetIPConfigurationsNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
 	req, err := lastResults.interfaceIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -802,17 +802,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetIPConfigurationsNextRes
 	resp, err := client.ListVirtualMachineScaleSetIPConfigurationsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetIPConfigurationsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetIPConfigurationsComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetIPConfigurations(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	return
 }
@@ -821,31 +821,31 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsComplet
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -867,14 +867,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPrepar
 
 // ListVirtualMachineScaleSetNetworkInterfacesSender sends the ListVirtualMachineScaleSetNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -886,10 +886,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesRespon
 }
 
 // listVirtualMachineScaleSetNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -897,17 +897,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextRe
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -917,31 +917,31 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComple
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetVMNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -964,14 +964,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPrep
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesSender sends the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -983,10 +983,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResp
 }
 
 // listVirtualMachineScaleSetVMNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -994,17 +994,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNext
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	return
 }
@@ -1013,16 +1013,16 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComp
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // parameters is parameters supplied to update network interface tags.
-func (client InterfacesClient) UpdateTags(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (result InterfacesUpdateTagsFuture, err error) {
+func (client InterfacesGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (result InterfacesGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkInterfaceName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1030,7 +1030,7 @@ func (client InterfacesClient) UpdateTags(ctx context.Context, resourceGroupName
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client InterfacesClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (*http.Request, error) {
+func (client InterfacesGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -1054,7 +1054,7 @@ func (client InterfacesClient) UpdateTagsPreparer(ctx context.Context, resourceG
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) UpdateTagsSender(req *http.Request) (future InterfacesUpdateTagsFuture, err error) {
+func (client InterfacesGroupClient) UpdateTagsSender(req *http.Request) (future InterfacesGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1069,7 +1069,7 @@ func (client InterfacesClient) UpdateTagsSender(req *http.Request) (future Inter
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) UpdateTagsResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) UpdateTagsResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/loadbalancerbackendaddresspools.go b/services/network/mgmt/2017-10-01/network/loadbalancerbackendaddresspoolsgroup.go
similarity index 64%
rename from services/network/mgmt/2017-10-01/network/loadbalancerbackendaddresspools.go
rename to services/network/mgmt/2017-10-01/network/loadbalancerbackendaddresspoolsgroup.go
index b17aa2f26197..e6756bc4efff 100644
--- a/services/network/mgmt/2017-10-01/network/loadbalancerbackendaddresspools.go
+++ b/services/network/mgmt/2017-10-01/network/loadbalancerbackendaddresspoolsgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerBackendAddressPoolsClient is the network Client
-type LoadBalancerBackendAddressPoolsClient struct {
+// LoadBalancerBackendAddressPoolsGroupClient is the network Client
+type LoadBalancerBackendAddressPoolsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerBackendAddressPoolsClient creates an instance of the LoadBalancerBackendAddressPoolsClient client.
-func NewLoadBalancerBackendAddressPoolsClient(subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return NewLoadBalancerBackendAddressPoolsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerBackendAddressPoolsGroupClient creates an instance of the LoadBalancerBackendAddressPoolsGroupClient
+// client.
+func NewLoadBalancerBackendAddressPoolsGroupClient(subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerBackendAddressPoolsClientWithBaseURI creates an instance of the LoadBalancerBackendAddressPoolsClient
-// client.
-func NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return LoadBalancerBackendAddressPoolsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerBackendAddressPoolsGroupClient client.
+func NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return LoadBalancerBackendAddressPoolsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer backend address pool.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // backendAddressPoolName is the name of the backend address pool.
-func (client LoadBalancerBackendAddressPoolsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, backendAddressPoolName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"backendAddressPoolName": autorest.Encode("path", backendAddressPoolName),
 		"loadBalancerName":       autorest.Encode("path", loadBalancerName),
@@ -90,14 +91,14 @@ func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Cont
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Resp
 // List gets all the load balancer backed address pools.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerBackendAddressPoolsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbbaplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbbaplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Con
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	req, err := lastResults.loadBalancerBackendAddressPoolListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerBackendAddressPoolsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/loadbalancerfrontendipconfigurations.go b/services/network/mgmt/2017-10-01/network/loadbalancerfrontendipconfigurationsgroup.go
similarity index 63%
rename from services/network/mgmt/2017-10-01/network/loadbalancerfrontendipconfigurations.go
rename to services/network/mgmt/2017-10-01/network/loadbalancerfrontendipconfigurationsgroup.go
index fe8bd8982222..f053f441b33a 100644
--- a/services/network/mgmt/2017-10-01/network/loadbalancerfrontendipconfigurations.go
+++ b/services/network/mgmt/2017-10-01/network/loadbalancerfrontendipconfigurationsgroup.go
@@ -24,51 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerFrontendIPConfigurationsClient is the network Client
-type LoadBalancerFrontendIPConfigurationsClient struct {
+// LoadBalancerFrontendIPConfigurationsGroupClient is the network Client
+type LoadBalancerFrontendIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClient creates an instance of the LoadBalancerFrontendIPConfigurationsClient
-// client.
-func NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerFrontendIPConfigurationsGroupClient creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI creates an instance of the
-// LoadBalancerFrontendIPConfigurationsClient client.
-func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return LoadBalancerFrontendIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return LoadBalancerFrontendIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer frontend IP configuration.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // frontendIPConfigurationName is the name of the frontend IP configuration.
-func (client LoadBalancerFrontendIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, frontendIPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"frontendIPConfigurationName": autorest.Encode("path", frontendIPConfigurationName),
 		"loadBalancerName":            autorest.Encode("path", loadBalancerName),
@@ -91,14 +91,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -112,31 +112,31 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http
 // List gets all the load balancer frontend IP configurations.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerFrontendIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbficlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbficlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -158,14 +158,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -177,10 +177,10 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *htt
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	req, err := lastResults.loadBalancerFrontendIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -188,17 +188,17 @@ func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastRes
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/loadbalancerloadbalancingrules.go b/services/network/mgmt/2017-10-01/network/loadbalancerloadbalancingrulesgroup.go
similarity index 65%
rename from services/network/mgmt/2017-10-01/network/loadbalancerloadbalancingrules.go
rename to services/network/mgmt/2017-10-01/network/loadbalancerloadbalancingrulesgroup.go
index 7759e6807bbc..3875d314132c 100644
--- a/services/network/mgmt/2017-10-01/network/loadbalancerloadbalancingrules.go
+++ b/services/network/mgmt/2017-10-01/network/loadbalancerloadbalancingrulesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerLoadBalancingRulesClient is the network Client
-type LoadBalancerLoadBalancingRulesClient struct {
+// LoadBalancerLoadBalancingRulesGroupClient is the network Client
+type LoadBalancerLoadBalancingRulesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerLoadBalancingRulesClient creates an instance of the LoadBalancerLoadBalancingRulesClient client.
-func NewLoadBalancerLoadBalancingRulesClient(subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return NewLoadBalancerLoadBalancingRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerLoadBalancingRulesGroupClient creates an instance of the LoadBalancerLoadBalancingRulesGroupClient
+// client.
+func NewLoadBalancerLoadBalancingRulesGroupClient(subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerLoadBalancingRulesClientWithBaseURI creates an instance of the LoadBalancerLoadBalancingRulesClient
-// client.
-func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return LoadBalancerLoadBalancingRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerLoadBalancingRulesGroupClient client.
+func NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return LoadBalancerLoadBalancingRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified load balancer load balancing rule.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // loadBalancingRuleName is the name of the load balancing rule.
-func (client LoadBalancerLoadBalancingRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, loadBalancingRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":      autorest.Encode("path", loadBalancerName),
 		"loadBalancingRuleName": autorest.Encode("path", loadBalancingRuleName),
@@ -90,14 +91,14 @@ func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Conte
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Respo
 // List gets all the load balancing rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerLoadBalancingRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblbrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblbrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Cont
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Resp
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	req, err := lastResults.loadBalancerLoadBalancingRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults L
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerLoadBalancingRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/loadbalancernetworkinterfaces.go b/services/network/mgmt/2017-10-01/network/loadbalancernetworkinterfacesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-10-01/network/loadbalancernetworkinterfaces.go
rename to services/network/mgmt/2017-10-01/network/loadbalancernetworkinterfacesgroup.go
index 07d0bbb94a4a..96d687683d3a 100644
--- a/services/network/mgmt/2017-10-01/network/loadbalancernetworkinterfaces.go
+++ b/services/network/mgmt/2017-10-01/network/loadbalancernetworkinterfacesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerNetworkInterfacesClient is the network Client
-type LoadBalancerNetworkInterfacesClient struct {
+// LoadBalancerNetworkInterfacesGroupClient is the network Client
+type LoadBalancerNetworkInterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerNetworkInterfacesClient creates an instance of the LoadBalancerNetworkInterfacesClient client.
-func NewLoadBalancerNetworkInterfacesClient(subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return NewLoadBalancerNetworkInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerNetworkInterfacesGroupClient creates an instance of the LoadBalancerNetworkInterfacesGroupClient
+// client.
+func NewLoadBalancerNetworkInterfacesGroupClient(subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerNetworkInterfacesClientWithBaseURI creates an instance of the LoadBalancerNetworkInterfacesClient
-// client.
-func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return LoadBalancerNetworkInterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerNetworkInterfacesGroupClient client.
+func NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return LoadBalancerNetworkInterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets associated load balancer network interfaces.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerNetworkInterfacesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -89,14 +90,14 @@ func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Conte
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerNetworkInterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -108,10 +109,10 @@ func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Respo
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -119,17 +120,17 @@ func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults In
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerNetworkInterfacesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/loadbalancerprobes.go b/services/network/mgmt/2017-10-01/network/loadbalancerprobesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-10-01/network/loadbalancerprobes.go
rename to services/network/mgmt/2017-10-01/network/loadbalancerprobesgroup.go
index 7fa6374396e9..079a882a8baf 100644
--- a/services/network/mgmt/2017-10-01/network/loadbalancerprobes.go
+++ b/services/network/mgmt/2017-10-01/network/loadbalancerprobesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// LoadBalancerProbesClient is the network Client
-type LoadBalancerProbesClient struct {
+// LoadBalancerProbesGroupClient is the network Client
+type LoadBalancerProbesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerProbesClient creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClient(subscriptionID string) LoadBalancerProbesClient {
-	return NewLoadBalancerProbesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerProbesGroupClient creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClient(subscriptionID string) LoadBalancerProbesGroupClient {
+	return NewLoadBalancerProbesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerProbesClientWithBaseURI creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesClient {
-	return LoadBalancerProbesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerProbesGroupClientWithBaseURI creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesGroupClient {
+	return LoadBalancerProbesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer probe.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // probeName is the name of the probe.
-func (client LoadBalancerProbesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, probeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"probeName":         autorest.Encode("path", probeName),
@@ -89,14 +89,14 @@ func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resource
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) GetResponder(resp *http.Response) (result Probe, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +110,31 @@ func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result
 // List gets all the load balancer probes.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerProbesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
+func (client LoadBalancerProbesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -156,14 +156,14 @@ func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourc
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +175,10 @@ func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (resul
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
 	req, err := lastResults.loadBalancerProbeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +186,17 @@ func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerP
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerProbesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
+func (client LoadBalancerProbesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/loadbalancers.go b/services/network/mgmt/2017-10-01/network/loadbalancersgroup.go
similarity index 66%
rename from services/network/mgmt/2017-10-01/network/loadbalancers.go
rename to services/network/mgmt/2017-10-01/network/loadbalancersgroup.go
index 1c1bfe90861f..b4b02049d41f 100644
--- a/services/network/mgmt/2017-10-01/network/loadbalancers.go
+++ b/services/network/mgmt/2017-10-01/network/loadbalancersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// LoadBalancersClient is the network Client
-type LoadBalancersClient struct {
+// LoadBalancersGroupClient is the network Client
+type LoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancersClient creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClient(subscriptionID string) LoadBalancersClient {
-	return NewLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancersGroupClient creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClient(subscriptionID string) LoadBalancersGroupClient {
+	return NewLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancersClientWithBaseURI creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersClient {
-	return LoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancersGroupClientWithBaseURI creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersGroupClient {
+	return LoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // parameters is parameters supplied to the create or update load balancer operation.
-func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
+func (client LoadBalancersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (
 // Delete deletes the specified load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) DeleteSender(req *http.Request) (future LoadBalancersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBa
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LoadBalancersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. expand
 // is expands referenced resources.
-func (client LoadBalancersClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client LoadBalancersClient) GetResponder(resp *http.Response) (result Load
 // List gets all the load balancers in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LoadBalancersClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client LoadBalancersClient) ListResponder(resp *http.Response) (result Loa
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the load balancers in a subscription.
-func (client LoadBalancersClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Re
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerLis
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -434,16 +434,16 @@ func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result L
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // parameters is parameters supplied to update load balancer tags.
-func (client LoadBalancersClient) UpdateTags(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (result LoadBalancersUpdateTagsFuture, err error) {
+func (client LoadBalancersGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (result LoadBalancersGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, loadBalancerName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client LoadBalancersClient) UpdateTags(ctx context.Context, resourceGroupN
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client LoadBalancersClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (*http.Request, error) {
+func (client LoadBalancersGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -475,7 +475,7 @@ func (client LoadBalancersClient) UpdateTagsPreparer(ctx context.Context, resour
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) UpdateTagsSender(req *http.Request) (future LoadBalancersUpdateTagsFuture, err error) {
+func (client LoadBalancersGroupClient) UpdateTagsSender(req *http.Request) (future LoadBalancersGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client LoadBalancersClient) UpdateTagsSender(req *http.Request) (future Lo
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) UpdateTagsResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) UpdateTagsResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/localnetworkgateways.go b/services/network/mgmt/2017-10-01/network/localnetworkgatewaysgroup.go
similarity index 72%
rename from services/network/mgmt/2017-10-01/network/localnetworkgateways.go
rename to services/network/mgmt/2017-10-01/network/localnetworkgatewaysgroup.go
index 8be38f1799ca..acd0f08d2a12 100644
--- a/services/network/mgmt/2017-10-01/network/localnetworkgateways.go
+++ b/services/network/mgmt/2017-10-01/network/localnetworkgatewaysgroup.go
@@ -25,43 +25,43 @@ import (
 	"net/http"
 )
 
-// LocalNetworkGatewaysClient is the network Client
-type LocalNetworkGatewaysClient struct {
+// LocalNetworkGatewaysGroupClient is the network Client
+type LocalNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewLocalNetworkGatewaysClient creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
-	return NewLocalNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLocalNetworkGatewaysGroupClient creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClient(subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return NewLocalNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLocalNetworkGatewaysClientWithBaseURI creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
-	return LocalNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLocalNetworkGatewaysGroupClientWithBaseURI creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return LocalNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a local network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway. parameters is parameters supplied to the create or update local network gateway operation.
-func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}},
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, localNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -69,7 +69,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -93,7 +93,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -108,7 +108,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -123,22 +123,22 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Resp
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Delete", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Delete", err.Error())
 	}
 
 	req, err := client.DeletePreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -146,7 +146,7 @@ func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -168,7 +168,7 @@ func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -183,7 +183,7 @@ func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -197,36 +197,36 @@ func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Get", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Get", err.Error())
 	}
 
 	req, err := client.GetPreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -248,14 +248,14 @@ func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -269,31 +269,31 @@ func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (resu
 // List gets all the local network gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LocalNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
+func (client LocalNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -314,14 +314,14 @@ func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,10 +333,10 @@ func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
 	req, err := lastResults.localNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -344,17 +344,17 @@ func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetwor
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -363,22 +363,22 @@ func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resou
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway. parameters is parameters supplied to update local network gateway tags.
-func (client LocalNetworkGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (result LocalNetworkGatewaysUpdateTagsFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (result LocalNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "UpdateTags", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "UpdateTags", err.Error())
 	}
 
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, localNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -386,7 +386,7 @@ func (client LocalNetworkGatewaysClient) UpdateTags(ctx context.Context, resourc
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client LocalNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -410,7 +410,7 @@ func (client LocalNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context,
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (future LocalNetworkGatewaysUpdateTagsFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTagsSender(req *http.Request) (future LocalNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -425,7 +425,7 @@ func (client LocalNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (fu
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) UpdateTagsResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTagsResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/models.go b/services/network/mgmt/2017-10-01/network/models.go
index baa5110c9b1f..f989e8535771 100644
--- a/services/network/mgmt/2017-10-01/network/models.go
+++ b/services/network/mgmt/2017-10-01/network/models.go
@@ -36,6 +36,11 @@ const (
 	Deny Access = "Deny"
 )
 
+// PossibleAccessValues returns an array of possible values for the Access const type.
+func PossibleAccessValues() [2]Access {
+	return [2]Access{Allow, Deny}
+}
+
 // ApplicationGatewayBackendHealthServerHealth enumerates the values for application gateway backend health
 // server health.
 type ApplicationGatewayBackendHealthServerHealth string
@@ -53,6 +58,11 @@ const (
 	Up ApplicationGatewayBackendHealthServerHealth = "Up"
 )
 
+// PossibleApplicationGatewayBackendHealthServerHealthValues returns an array of possible values for the ApplicationGatewayBackendHealthServerHealth const type.
+func PossibleApplicationGatewayBackendHealthServerHealthValues() [5]ApplicationGatewayBackendHealthServerHealth {
+	return [5]ApplicationGatewayBackendHealthServerHealth{Down, Draining, Partial, Unknown, Up}
+}
+
 // ApplicationGatewayCookieBasedAffinity enumerates the values for application gateway cookie based affinity.
 type ApplicationGatewayCookieBasedAffinity string
 
@@ -63,6 +73,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayFirewallMode enumerates the values for application gateway firewall mode.
 type ApplicationGatewayFirewallMode string
 
@@ -73,6 +88,11 @@ const (
 	Prevention ApplicationGatewayFirewallMode = "Prevention"
 )
 
+// PossibleApplicationGatewayFirewallModeValues returns an array of possible values for the ApplicationGatewayFirewallMode const type.
+func PossibleApplicationGatewayFirewallModeValues() [2]ApplicationGatewayFirewallMode {
+	return [2]ApplicationGatewayFirewallMode{Detection, Prevention}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -87,6 +107,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -97,6 +122,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRedirectType enumerates the values for application gateway redirect type.
 type ApplicationGatewayRedirectType string
 
@@ -111,6 +141,11 @@ const (
 	Temporary ApplicationGatewayRedirectType = "Temporary"
 )
 
+// PossibleApplicationGatewayRedirectTypeValues returns an array of possible values for the ApplicationGatewayRedirectType const type.
+func PossibleApplicationGatewayRedirectTypeValues() [4]ApplicationGatewayRedirectType {
+	return [4]ApplicationGatewayRedirectType{Found, Permanent, SeeOther, Temporary}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -122,6 +157,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -138,6 +178,11 @@ const (
 	WAFMedium ApplicationGatewaySkuName = "WAF_Medium"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [5]ApplicationGatewaySkuName {
+	return [5]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall, WAFLarge, WAFMedium}
+}
+
 // ApplicationGatewaySslCipherSuite enumerates the values for application gateway ssl cipher suite.
 type ApplicationGatewaySslCipherSuite string
 
@@ -194,6 +239,11 @@ const (
 	TLSRSAWITHAES256GCMSHA384 ApplicationGatewaySslCipherSuite = "TLS_RSA_WITH_AES_256_GCM_SHA384"
 )
 
+// PossibleApplicationGatewaySslCipherSuiteValues returns an array of possible values for the ApplicationGatewaySslCipherSuite const type.
+func PossibleApplicationGatewaySslCipherSuiteValues() [25]ApplicationGatewaySslCipherSuite {
+	return [25]ApplicationGatewaySslCipherSuite{TLSDHEDSSWITHAES128CBCSHA, TLSDHEDSSWITHAES128CBCSHA256, TLSDHEDSSWITHAES256CBCSHA, TLSDHEDSSWITHAES256CBCSHA256, TLSDHERSAWITHAES128CBCSHA, TLSDHERSAWITHAES128GCMSHA256, TLSDHERSAWITHAES256CBCSHA, TLSDHERSAWITHAES256GCMSHA384, TLSECDHEECDSAWITHAES128CBCSHA, TLSECDHEECDSAWITHAES128CBCSHA256, TLSECDHEECDSAWITHAES128GCMSHA256, TLSECDHEECDSAWITHAES256CBCSHA, TLSECDHEECDSAWITHAES256CBCSHA384, TLSECDHEECDSAWITHAES256GCMSHA384, TLSECDHERSAWITHAES128CBCSHA, TLSECDHERSAWITHAES128CBCSHA256, TLSECDHERSAWITHAES256CBCSHA, TLSECDHERSAWITHAES256CBCSHA384, TLSRSAWITH3DESEDECBCSHA, TLSRSAWITHAES128CBCSHA, TLSRSAWITHAES128CBCSHA256, TLSRSAWITHAES128GCMSHA256, TLSRSAWITHAES256CBCSHA, TLSRSAWITHAES256CBCSHA256, TLSRSAWITHAES256GCMSHA384}
+}
+
 // ApplicationGatewaySslPolicyName enumerates the values for application gateway ssl policy name.
 type ApplicationGatewaySslPolicyName string
 
@@ -206,6 +256,11 @@ const (
 	AppGwSslPolicy20170401S ApplicationGatewaySslPolicyName = "AppGwSslPolicy20170401S"
 )
 
+// PossibleApplicationGatewaySslPolicyNameValues returns an array of possible values for the ApplicationGatewaySslPolicyName const type.
+func PossibleApplicationGatewaySslPolicyNameValues() [3]ApplicationGatewaySslPolicyName {
+	return [3]ApplicationGatewaySslPolicyName{AppGwSslPolicy20150501, AppGwSslPolicy20170401, AppGwSslPolicy20170401S}
+}
+
 // ApplicationGatewaySslPolicyType enumerates the values for application gateway ssl policy type.
 type ApplicationGatewaySslPolicyType string
 
@@ -216,6 +271,11 @@ const (
 	Predefined ApplicationGatewaySslPolicyType = "Predefined"
 )
 
+// PossibleApplicationGatewaySslPolicyTypeValues returns an array of possible values for the ApplicationGatewaySslPolicyType const type.
+func PossibleApplicationGatewaySslPolicyTypeValues() [2]ApplicationGatewaySslPolicyType {
+	return [2]ApplicationGatewaySslPolicyType{Custom, Predefined}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -228,6 +288,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -238,6 +303,11 @@ const (
 	WAF ApplicationGatewayTier = "WAF"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [2]ApplicationGatewayTier {
+	return [2]ApplicationGatewayTier{Standard, WAF}
+}
+
 // AssociationType enumerates the values for association type.
 type AssociationType string
 
@@ -248,6 +318,11 @@ const (
 	Contains AssociationType = "Contains"
 )
 
+// PossibleAssociationTypeValues returns an array of possible values for the AssociationType const type.
+func PossibleAssociationTypeValues() [2]AssociationType {
+	return [2]AssociationType{Associated, Contains}
+}
+
 // AuthenticationMethod enumerates the values for authentication method.
 type AuthenticationMethod string
 
@@ -258,6 +333,11 @@ const (
 	EAPTLS AuthenticationMethod = "EAPTLS"
 )
 
+// PossibleAuthenticationMethodValues returns an array of possible values for the AuthenticationMethod const type.
+func PossibleAuthenticationMethodValues() [2]AuthenticationMethod {
+	return [2]AuthenticationMethod{EAPMSCHAPv2, EAPTLS}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -268,6 +348,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // BgpPeerState enumerates the values for bgp peer state.
 type BgpPeerState string
 
@@ -284,6 +369,11 @@ const (
 	BgpPeerStateUnknown BgpPeerState = "Unknown"
 )
 
+// PossibleBgpPeerStateValues returns an array of possible values for the BgpPeerState const type.
+func PossibleBgpPeerStateValues() [5]BgpPeerState {
+	return [5]BgpPeerState{BgpPeerStateConnected, BgpPeerStateConnecting, BgpPeerStateIdle, BgpPeerStateStopped, BgpPeerStateUnknown}
+}
+
 // ConnectionState enumerates the values for connection state.
 type ConnectionState string
 
@@ -296,6 +386,11 @@ const (
 	ConnectionStateUnreachable ConnectionState = "Unreachable"
 )
 
+// PossibleConnectionStateValues returns an array of possible values for the ConnectionState const type.
+func PossibleConnectionStateValues() [3]ConnectionState {
+	return [3]ConnectionState{ConnectionStateReachable, ConnectionStateUnknown, ConnectionStateUnreachable}
+}
+
 // ConnectionStatus enumerates the values for connection status.
 type ConnectionStatus string
 
@@ -310,6 +405,11 @@ const (
 	ConnectionStatusUnknown ConnectionStatus = "Unknown"
 )
 
+// PossibleConnectionStatusValues returns an array of possible values for the ConnectionStatus const type.
+func PossibleConnectionStatusValues() [4]ConnectionStatus {
+	return [4]ConnectionStatus{ConnectionStatusConnected, ConnectionStatusDegraded, ConnectionStatusDisconnected, ConnectionStatusUnknown}
+}
+
 // DhGroup enumerates the values for dh group.
 type DhGroup string
 
@@ -332,6 +432,11 @@ const (
 	None DhGroup = "None"
 )
 
+// PossibleDhGroupValues returns an array of possible values for the DhGroup const type.
+func PossibleDhGroupValues() [8]DhGroup {
+	return [8]DhGroup{DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+}
+
 // Direction enumerates the values for direction.
 type Direction string
 
@@ -342,6 +447,11 @@ const (
 	Outbound Direction = "Outbound"
 )
 
+// PossibleDirectionValues returns an array of possible values for the Direction const type.
+func PossibleDirectionValues() [2]Direction {
+	return [2]Direction{Inbound, Outbound}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -356,6 +466,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -366,6 +481,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // EffectiveSecurityRuleProtocol enumerates the values for effective security rule protocol.
 type EffectiveSecurityRuleProtocol string
 
@@ -378,6 +498,11 @@ const (
 	UDP EffectiveSecurityRuleProtocol = "Udp"
 )
 
+// PossibleEffectiveSecurityRuleProtocolValues returns an array of possible values for the EffectiveSecurityRuleProtocol const type.
+func PossibleEffectiveSecurityRuleProtocolValues() [3]EffectiveSecurityRuleProtocol {
+	return [3]EffectiveSecurityRuleProtocol{All, TCP, UDP}
+}
+
 // EvaluationState enumerates the values for evaluation state.
 type EvaluationState string
 
@@ -390,6 +515,11 @@ const (
 	NotStarted EvaluationState = "NotStarted"
 )
 
+// PossibleEvaluationStateValues returns an array of possible values for the EvaluationState const type.
+func PossibleEvaluationStateValues() [3]EvaluationState {
+	return [3]EvaluationState{Completed, InProgress, NotStarted}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -405,6 +535,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -415,6 +550,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -427,6 +567,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -437,6 +582,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -447,6 +597,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IkeEncryption enumerates the values for ike encryption.
 type IkeEncryption string
 
@@ -463,6 +618,11 @@ const (
 	DES3 IkeEncryption = "DES3"
 )
 
+// PossibleIkeEncryptionValues returns an array of possible values for the IkeEncryption const type.
+func PossibleIkeEncryptionValues() [5]IkeEncryption {
+	return [5]IkeEncryption{AES128, AES192, AES256, DES, DES3}
+}
+
 // IkeIntegrity enumerates the values for ike integrity.
 type IkeIntegrity string
 
@@ -477,6 +637,11 @@ const (
 	SHA384 IkeIntegrity = "SHA384"
 )
 
+// PossibleIkeIntegrityValues returns an array of possible values for the IkeIntegrity const type.
+func PossibleIkeIntegrityValues() [4]IkeIntegrity {
+	return [4]IkeIntegrity{MD5, SHA1, SHA256, SHA384}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -487,6 +652,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IpsecEncryption enumerates the values for ipsec encryption.
 type IpsecEncryption string
 
@@ -511,6 +681,11 @@ const (
 	IpsecEncryptionNone IpsecEncryption = "None"
 )
 
+// PossibleIpsecEncryptionValues returns an array of possible values for the IpsecEncryption const type.
+func PossibleIpsecEncryptionValues() [9]IpsecEncryption {
+	return [9]IpsecEncryption{IpsecEncryptionAES128, IpsecEncryptionAES192, IpsecEncryptionAES256, IpsecEncryptionDES, IpsecEncryptionDES3, IpsecEncryptionGCMAES128, IpsecEncryptionGCMAES192, IpsecEncryptionGCMAES256, IpsecEncryptionNone}
+}
+
 // IpsecIntegrity enumerates the values for ipsec integrity.
 type IpsecIntegrity string
 
@@ -529,6 +704,11 @@ const (
 	IpsecIntegritySHA256 IpsecIntegrity = "SHA256"
 )
 
+// PossibleIpsecIntegrityValues returns an array of possible values for the IpsecIntegrity const type.
+func PossibleIpsecIntegrityValues() [6]IpsecIntegrity {
+	return [6]IpsecIntegrity{IpsecIntegrityGCMAES128, IpsecIntegrityGCMAES192, IpsecIntegrityGCMAES256, IpsecIntegrityMD5, IpsecIntegritySHA1, IpsecIntegritySHA256}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -539,6 +719,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // IssueType enumerates the values for issue type.
 type IssueType string
 
@@ -563,6 +748,11 @@ const (
 	IssueTypeUserDefinedRoute IssueType = "UserDefinedRoute"
 )
 
+// PossibleIssueTypeValues returns an array of possible values for the IssueType const type.
+func PossibleIssueTypeValues() [9]IssueType {
+	return [9]IssueType{IssueTypeAgentStopped, IssueTypeDNSResolution, IssueTypeGuestFirewall, IssueTypeNetworkSecurityRule, IssueTypePlatform, IssueTypePortThrottled, IssueTypeSocketBind, IssueTypeUnknown, IssueTypeUserDefinedRoute}
+}
+
 // LoadBalancerSkuName enumerates the values for load balancer sku name.
 type LoadBalancerSkuName string
 
@@ -573,6 +763,11 @@ const (
 	LoadBalancerSkuNameStandard LoadBalancerSkuName = "Standard"
 )
 
+// PossibleLoadBalancerSkuNameValues returns an array of possible values for the LoadBalancerSkuName const type.
+func PossibleLoadBalancerSkuNameValues() [2]LoadBalancerSkuName {
+	return [2]LoadBalancerSkuName{LoadBalancerSkuNameBasic, LoadBalancerSkuNameStandard}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -585,6 +780,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // NextHopType enumerates the values for next hop type.
 type NextHopType string
 
@@ -603,6 +803,11 @@ const (
 	NextHopTypeVnetLocal NextHopType = "VnetLocal"
 )
 
+// PossibleNextHopTypeValues returns an array of possible values for the NextHopType const type.
+func PossibleNextHopTypeValues() [6]NextHopType {
+	return [6]NextHopType{NextHopTypeHyperNetGateway, NextHopTypeInternet, NextHopTypeNone, NextHopTypeVirtualAppliance, NextHopTypeVirtualNetworkGateway, NextHopTypeVnetLocal}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -615,6 +820,11 @@ const (
 	OperationStatusSucceeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{OperationStatusFailed, OperationStatusInProgress, OperationStatusSucceeded}
+}
+
 // Origin enumerates the values for origin.
 type Origin string
 
@@ -627,6 +837,11 @@ const (
 	OriginOutbound Origin = "Outbound"
 )
 
+// PossibleOriginValues returns an array of possible values for the Origin const type.
+func PossibleOriginValues() [3]Origin {
+	return [3]Origin{OriginInbound, OriginLocal, OriginOutbound}
+}
+
 // PcError enumerates the values for pc error.
 type PcError string
 
@@ -643,6 +858,11 @@ const (
 	StorageFailed PcError = "StorageFailed"
 )
 
+// PossiblePcErrorValues returns an array of possible values for the PcError const type.
+func PossiblePcErrorValues() [5]PcError {
+	return [5]PcError{AgentStopped, CaptureFailed, InternalError, LocalFileFailed, StorageFailed}
+}
+
 // PcProtocol enumerates the values for pc protocol.
 type PcProtocol string
 
@@ -655,6 +875,11 @@ const (
 	PcProtocolUDP PcProtocol = "UDP"
 )
 
+// PossiblePcProtocolValues returns an array of possible values for the PcProtocol const type.
+func PossiblePcProtocolValues() [3]PcProtocol {
+	return [3]PcProtocol{PcProtocolAny, PcProtocolTCP, PcProtocolUDP}
+}
+
 // PcStatus enumerates the values for pc status.
 type PcStatus string
 
@@ -671,6 +896,11 @@ const (
 	PcStatusUnknown PcStatus = "Unknown"
 )
 
+// PossiblePcStatusValues returns an array of possible values for the PcStatus const type.
+func PossiblePcStatusValues() [5]PcStatus {
+	return [5]PcStatus{PcStatusError, PcStatusNotStarted, PcStatusRunning, PcStatusStopped, PcStatusUnknown}
+}
+
 // PfsGroup enumerates the values for pfs group.
 type PfsGroup string
 
@@ -691,6 +921,11 @@ const (
 	PfsGroupPFS24 PfsGroup = "PFS24"
 )
 
+// PossiblePfsGroupValues returns an array of possible values for the PfsGroup const type.
+func PossiblePfsGroupValues() [7]PfsGroup {
+	return [7]PfsGroup{PfsGroupECP256, PfsGroupECP384, PfsGroupNone, PfsGroupPFS1, PfsGroupPFS2, PfsGroupPFS2048, PfsGroupPFS24}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -701,6 +936,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -711,6 +951,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // Protocol enumerates the values for protocol.
 type Protocol string
 
@@ -721,6 +966,11 @@ const (
 	ProtocolUDP Protocol = "UDP"
 )
 
+// PossibleProtocolValues returns an array of possible values for the Protocol const type.
+func PossibleProtocolValues() [2]Protocol {
+	return [2]Protocol{ProtocolTCP, ProtocolUDP}
+}
+
 // ProvisioningState enumerates the values for provisioning state.
 type ProvisioningState string
 
@@ -735,6 +985,11 @@ const (
 	Updating ProvisioningState = "Updating"
 )
 
+// PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type.
+func PossibleProvisioningStateValues() [4]ProvisioningState {
+	return [4]ProvisioningState{Deleting, Failed, Succeeded, Updating}
+}
+
 // PublicIPAddressSkuName enumerates the values for public ip address sku name.
 type PublicIPAddressSkuName string
 
@@ -745,6 +1000,11 @@ const (
 	PublicIPAddressSkuNameStandard PublicIPAddressSkuName = "Standard"
 )
 
+// PossiblePublicIPAddressSkuNameValues returns an array of possible values for the PublicIPAddressSkuName const type.
+func PossiblePublicIPAddressSkuNameValues() [2]PublicIPAddressSkuName {
+	return [2]PublicIPAddressSkuName{PublicIPAddressSkuNameBasic, PublicIPAddressSkuNameStandard}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -761,6 +1021,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -771,6 +1036,11 @@ const (
 	SecurityRuleAccessDeny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{SecurityRuleAccessAllow, SecurityRuleAccessDeny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -781,6 +1051,11 @@ const (
 	SecurityRuleDirectionOutbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{SecurityRuleDirectionInbound, SecurityRuleDirectionOutbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -793,6 +1068,11 @@ const (
 	SecurityRuleProtocolUDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{SecurityRuleProtocolAsterisk, SecurityRuleProtocolTCP, SecurityRuleProtocolUDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -807,6 +1087,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // Severity enumerates the values for severity.
 type Severity string
 
@@ -817,6 +1102,11 @@ const (
 	SeverityWarning Severity = "Warning"
 )
 
+// PossibleSeverityValues returns an array of possible values for the Severity const type.
+func PossibleSeverityValues() [2]Severity {
+	return [2]Severity{SeverityError, SeverityWarning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -829,6 +1119,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [3]TransportProtocol {
+	return [3]TransportProtocol{TransportProtocolAll, TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -843,6 +1138,11 @@ const (
 	VirtualNetworkGatewayConnectionStatusUnknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{VirtualNetworkGatewayConnectionStatusConnected, VirtualNetworkGatewayConnectionStatusConnecting, VirtualNetworkGatewayConnectionStatusNotConnected, VirtualNetworkGatewayConnectionStatusUnknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -857,6 +1157,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -877,6 +1182,11 @@ const (
 	VirtualNetworkGatewaySkuNameVpnGw3 VirtualNetworkGatewaySkuName = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [7]VirtualNetworkGatewaySkuName {
+	return [7]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance, VirtualNetworkGatewaySkuNameVpnGw1, VirtualNetworkGatewaySkuNameVpnGw2, VirtualNetworkGatewaySkuNameVpnGw3}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -897,6 +1207,11 @@ const (
 	VirtualNetworkGatewaySkuTierVpnGw3 VirtualNetworkGatewaySkuTier = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [7]VirtualNetworkGatewaySkuTier {
+	return [7]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance, VirtualNetworkGatewaySkuTierVpnGw1, VirtualNetworkGatewaySkuTierVpnGw2, VirtualNetworkGatewaySkuTierVpnGw3}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -907,6 +1222,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -919,6 +1239,11 @@ const (
 	Initiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{Connected, Disconnected, Initiated}
+}
+
 // VpnClientProtocol enumerates the values for vpn client protocol.
 type VpnClientProtocol string
 
@@ -929,6 +1254,11 @@ const (
 	SSTP VpnClientProtocol = "SSTP"
 )
 
+// PossibleVpnClientProtocolValues returns an array of possible values for the VpnClientProtocol const type.
+func PossibleVpnClientProtocolValues() [2]VpnClientProtocol {
+	return [2]VpnClientProtocol{IkeV2, SSTP}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -939,6 +1269,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
@@ -2632,29 +2967,29 @@ type ApplicationGatewayRequestRoutingRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// ApplicationGatewaysBackendHealthFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupBackendHealthFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysBackendHealthFuture struct {
+type ApplicationGatewaysGroupBackendHealthFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGatewaysClient) (agbh ApplicationGatewayBackendHealth, err error) {
+func (future ApplicationGatewaysGroupBackendHealthFuture) Result(client ApplicationGatewaysGroupClient) (agbh ApplicationGatewayBackendHealth, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysBackendHealthFuture")
+		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupBackendHealthFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		agbh, err = client.BackendHealthResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2671,39 +3006,39 @@ func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGa
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	agbh, err = client.BackendHealthResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysCreateOrUpdateFuture struct {
+type ApplicationGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) {
+func (future ApplicationGatewaysGroupCreateOrUpdateFuture) Result(client ApplicationGatewaysGroupClient) (ag ApplicationGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysCreateOrUpdateFuture")
+		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ag, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2720,39 +3055,39 @@ func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationG
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ag, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ApplicationGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ApplicationGatewaysDeleteFuture struct {
+type ApplicationGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
+func (future ApplicationGatewaysGroupDeleteFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2769,12 +3104,159 @@ func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStartFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStartFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStartFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStartFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StartResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StartResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStopFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStopFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStopFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StopResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StopResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type ApplicationGatewaysGroupUpdateTagsFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupUpdateTagsFuture) Result(client ApplicationGatewaysGroupClient) (ag ApplicationGateway, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupUpdateTagsFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ag, err = client.UpdateTagsResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ag, err = client.UpdateTagsResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -2918,181 +3400,34 @@ func (agspp *ApplicationGatewaySslPredefinedPolicy) UnmarshalJSON(body []byte) e
 			}
 		case "properties":
 			if v != nil {
-				var applicationGatewaySslPredefinedPolicyPropertiesFormat ApplicationGatewaySslPredefinedPolicyPropertiesFormat
-				err = json.Unmarshal(*v, &applicationGatewaySslPredefinedPolicyPropertiesFormat)
-				if err != nil {
-					return err
-				}
-				agspp.ApplicationGatewaySslPredefinedPolicyPropertiesFormat = &applicationGatewaySslPredefinedPolicyPropertiesFormat
-			}
-		case "id":
-			if v != nil {
-				var ID string
-				err = json.Unmarshal(*v, &ID)
-				if err != nil {
-					return err
-				}
-				agspp.ID = &ID
-			}
-		}
-	}
-
-	return nil
-}
-
-// ApplicationGatewaySslPredefinedPolicyPropertiesFormat properties of ApplicationGatewaySslPredefinedPolicy
-type ApplicationGatewaySslPredefinedPolicyPropertiesFormat struct {
-	// CipherSuites - Ssl cipher suites to be enabled in the specified order for application gateway.
-	CipherSuites *[]ApplicationGatewaySslCipherSuite `json:"cipherSuites,omitempty"`
-	// MinProtocolVersion - Minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv10', 'TLSv11', 'TLSv12'
-	MinProtocolVersion ApplicationGatewaySslProtocol `json:"minProtocolVersion,omitempty"`
-}
-
-// ApplicationGatewaysStartFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStartFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStartFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StartResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StartResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
-// ApplicationGatewaysStopFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStopFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStopFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StopResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StopResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
-// ApplicationGatewaysUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysUpdateTagsFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysUpdateTagsFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysUpdateTagsFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ag, err = client.UpdateTagsResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
+				var applicationGatewaySslPredefinedPolicyPropertiesFormat ApplicationGatewaySslPredefinedPolicyPropertiesFormat
+				err = json.Unmarshal(*v, &applicationGatewaySslPredefinedPolicyPropertiesFormat)
+				if err != nil {
+					return err
+				}
+				agspp.ApplicationGatewaySslPredefinedPolicyPropertiesFormat = &applicationGatewaySslPredefinedPolicyPropertiesFormat
+			}
+		case "id":
+			if v != nil {
+				var ID string
+				err = json.Unmarshal(*v, &ID)
+				if err != nil {
+					return err
+				}
+				agspp.ID = &ID
+			}
 		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ag, err = client.UpdateTagsResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
-	return
+
+	return nil
+}
+
+// ApplicationGatewaySslPredefinedPolicyPropertiesFormat properties of ApplicationGatewaySslPredefinedPolicy
+type ApplicationGatewaySslPredefinedPolicyPropertiesFormat struct {
+	// CipherSuites - Ssl cipher suites to be enabled in the specified order for application gateway.
+	CipherSuites *[]ApplicationGatewaySslCipherSuite `json:"cipherSuites,omitempty"`
+	// MinProtocolVersion - Minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv10', 'TLSv11', 'TLSv12'
+	MinProtocolVersion ApplicationGatewaySslProtocol `json:"minProtocolVersion,omitempty"`
 }
 
 // ApplicationGatewayURLPathMap urlPathMaps give a url path to the backend mapping information for
@@ -3433,29 +3768,29 @@ type ApplicationSecurityGroupPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// ApplicationSecurityGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationSecurityGroupsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationSecurityGroupsCreateOrUpdateFuture struct {
+type ApplicationSecurityGroupsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client ApplicationSecurityGroupsClient) (asg ApplicationSecurityGroup, err error) {
+func (future ApplicationSecurityGroupsGroupCreateOrUpdateFuture) Result(client ApplicationSecurityGroupsGroupClient) (asg ApplicationSecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return asg, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsCreateOrUpdateFuture")
+		return asg, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		asg, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3472,39 +3807,39 @@ func (future ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client Applic
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	asg, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationSecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationSecurityGroupsDeleteFuture struct {
+// ApplicationSecurityGroupsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type ApplicationSecurityGroupsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationSecurityGroupsDeleteFuture) Result(client ApplicationSecurityGroupsClient) (ar autorest.Response, err error) {
+func (future ApplicationSecurityGroupsGroupDeleteFuture) Result(client ApplicationSecurityGroupsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3521,12 +3856,12 @@ func (future ApplicationSecurityGroupsDeleteFuture) Result(client ApplicationSec
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -4350,29 +4685,29 @@ type ConnectionMonitorResultProperties struct {
 	MonitoringIntervalInSeconds *int32 `json:"monitoringIntervalInSeconds,omitempty"`
 }
 
-// ConnectionMonitorsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ConnectionMonitorsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ConnectionMonitorsCreateOrUpdateFuture struct {
+type ConnectionMonitorsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsCreateOrUpdateFuture) Result(client ConnectionMonitorsClient) (cmr ConnectionMonitorResult, err error) {
+func (future ConnectionMonitorsGroupCreateOrUpdateFuture) Result(client ConnectionMonitorsGroupClient) (cmr ConnectionMonitorResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return cmr, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsCreateOrUpdateFuture")
+		return cmr, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		cmr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4389,39 +4724,39 @@ func (future ConnectionMonitorsCreateOrUpdateFuture) Result(client ConnectionMon
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	cmr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ConnectionMonitorsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ConnectionMonitorsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ConnectionMonitorsDeleteFuture struct {
+type ConnectionMonitorsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsDeleteFuture) Result(client ConnectionMonitorsClient) (ar autorest.Response, err error) {
+func (future ConnectionMonitorsGroupDeleteFuture) Result(client ConnectionMonitorsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4438,47 +4773,39 @@ func (future ConnectionMonitorsDeleteFuture) Result(client ConnectionMonitorsCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ConnectionMonitorSource describes the source of connection monitor.
-type ConnectionMonitorSource struct {
-	// ResourceID - The ID of the resource used as the source by connection monitor.
-	ResourceID *string `json:"resourceId,omitempty"`
-	// Port - The source port used by connection monitor.
-	Port *int32 `json:"port,omitempty"`
-}
-
-// ConnectionMonitorsQueryFuture an abstraction for monitoring and retrieving the results of a long-running
+// ConnectionMonitorsGroupQueryFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ConnectionMonitorsQueryFuture struct {
+type ConnectionMonitorsGroupQueryFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsQueryFuture) Result(client ConnectionMonitorsClient) (cmqr ConnectionMonitorQueryResult, err error) {
+func (future ConnectionMonitorsGroupQueryFuture) Result(client ConnectionMonitorsGroupClient) (cmqr ConnectionMonitorQueryResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsQueryFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupQueryFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return cmqr, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsQueryFuture")
+		return cmqr, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupQueryFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		cmqr, err = client.QueryResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsQueryFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupQueryFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4495,39 +4822,39 @@ func (future ConnectionMonitorsQueryFuture) Result(client ConnectionMonitorsClie
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsQueryFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupQueryFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	cmqr, err = client.QueryResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsQueryFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupQueryFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ConnectionMonitorsStartFuture an abstraction for monitoring and retrieving the results of a long-running
+// ConnectionMonitorsGroupStartFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ConnectionMonitorsStartFuture struct {
+type ConnectionMonitorsGroupStartFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsStartFuture) Result(client ConnectionMonitorsClient) (ar autorest.Response, err error) {
+func (future ConnectionMonitorsGroupStartFuture) Result(client ConnectionMonitorsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStartFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStartFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsStartFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupStartFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StartResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStartFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStartFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4544,39 +4871,39 @@ func (future ConnectionMonitorsStartFuture) Result(client ConnectionMonitorsClie
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStartFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStartFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StartResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStartFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStartFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ConnectionMonitorsStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// ConnectionMonitorsGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ConnectionMonitorsStopFuture struct {
+type ConnectionMonitorsGroupStopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsStopFuture) Result(client ConnectionMonitorsClient) (ar autorest.Response, err error) {
+func (future ConnectionMonitorsGroupStopFuture) Result(client ConnectionMonitorsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsStopFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupStopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4593,16 +4920,24 @@ func (future ConnectionMonitorsStopFuture) Result(client ConnectionMonitorsClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// ConnectionMonitorSource describes the source of connection monitor.
+type ConnectionMonitorSource struct {
+	// ResourceID - The ID of the resource used as the source by connection monitor.
+	ResourceID *string `json:"resourceId,omitempty"`
+	// Port - The source port used by connection monitor.
+	Port *int32 `json:"port,omitempty"`
+}
+
 // ConnectionResetSharedKey the virtual network connection reset shared key
 type ConnectionResetSharedKey struct {
 	autorest.Response `json:"-"`
@@ -5172,29 +5507,29 @@ func (erca *ExpressRouteCircuitAuthorization) UnmarshalJSON(body []byte) error {
 	return nil
 }
 
-// ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results
-// of a long-running operation.
-type ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (erca ExpressRouteCircuitAuthorization, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (erca ExpressRouteCircuitAuthorization, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture")
+		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erca, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5211,39 +5546,39 @@ func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(clien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erca, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitAuthorizationsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitAuthorizationsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitAuthorizationsDeleteFuture struct {
+type ExpressRouteCircuitAuthorizationsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5260,12 +5595,12 @@ func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client Expres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -5593,29 +5928,29 @@ type ExpressRouteCircuitPeeringPropertiesFormat struct {
 	Ipv6PeeringConfig *Ipv6ExpressRouteCircuitPeeringConfig `json:"ipv6PeeringConfig,omitempty"`
 }
 
-// ExpressRouteCircuitPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitPeeringsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsClient) (ercp ExpressRouteCircuitPeering, err error) {
+func (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ercp ExpressRouteCircuitPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture")
+		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5632,39 +5967,39 @@ func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client Expr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitPeeringsDeleteFuture struct {
+type ExpressRouteCircuitPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRouteCircuitPeeringsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitPeeringsGroupDeleteFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5681,12 +6016,12 @@ func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRoute
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -5752,29 +6087,39 @@ type ExpressRouteCircuitsArpTableListResult struct {
 	NextLink *string `json:"nextLink,omitempty"`
 }
 
-// ExpressRouteCircuitsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
+type ExpressRouteCircuitServiceProviderProperties struct {
+	// ServiceProviderName - The serviceProviderName.
+	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
+	// PeeringLocation - The peering location.
+	PeeringLocation *string `json:"peeringLocation,omitempty"`
+	// BandwidthInMbps - The BandwidthInMbps.
+	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
+}
+
+// ExpressRouteCircuitsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsCreateOrUpdateFuture struct {
+type ExpressRouteCircuitsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) {
+func (future ExpressRouteCircuitsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitsGroupClient) (erc ExpressRouteCircuit, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsCreateOrUpdateFuture")
+		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5791,39 +6136,39 @@ func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRout
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ExpressRouteCircuitsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ExpressRouteCircuitsDeleteFuture struct {
+type ExpressRouteCircuitsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuitsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitsGroupDeleteFuture) Result(client ExpressRouteCircuitsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5840,59 +6185,39 @@ func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuit
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
-type ExpressRouteCircuitServiceProviderProperties struct {
-	// ServiceProviderName - The serviceProviderName.
-	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
-	// PeeringLocation - The peering location.
-	PeeringLocation *string `json:"peeringLocation,omitempty"`
-	// BandwidthInMbps - The BandwidthInMbps.
-	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
-}
-
-// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
-type ExpressRouteCircuitSku struct {
-	// Name - The name of the SKU.
-	Name *string `json:"name,omitempty"`
-	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
-	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
-	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
-	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
-}
-
-// ExpressRouteCircuitsListArpTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListArpTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListArpTableFuture struct {
+type ExpressRouteCircuitsGroupListArpTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteCircuitsClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListArpTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListArpTableFuture")
+		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListArpTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercatlr, err = client.ListArpTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5909,39 +6234,39 @@ func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercatlr, err = client.ListArpTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListRoutesTableFuture struct {
+type ExpressRouteCircuitsGroupListRoutesTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRouteCircuitsClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableFuture")
+		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtlr, err = client.ListRoutesTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5958,39 +6283,39 @@ func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtlr, err = client.ListRoutesTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitsListRoutesTableSummaryFuture struct {
+// ExpressRouteCircuitsGroupListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type ExpressRouteCircuitsGroupListRoutesTableSummaryFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableSummaryFuture")
+		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtslr, err = client.ListRoutesTableSummaryResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6007,72 +6332,39 @@ func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client Exp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtslr, err = client.ListRoutesTableSummaryResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsRoutesTableListResult response for ListRoutesTable associated with the Express Route
-// Circuits API.
-type ExpressRouteCircuitsRoutesTableListResult struct {
-	autorest.Response `json:"-"`
-	// Value - The list of routes table.
-	Value *[]ExpressRouteCircuitRoutesTable `json:"value,omitempty"`
-	// NextLink - The URL to get the next set of results.
-	NextLink *string `json:"nextLink,omitempty"`
-}
-
-// ExpressRouteCircuitsRoutesTableSummaryListResult response for ListRoutesTable associated with the Express Route
-// Circuits API.
-type ExpressRouteCircuitsRoutesTableSummaryListResult struct {
-	autorest.Response `json:"-"`
-	// Value - A list of the routes table.
-	Value *[]ExpressRouteCircuitRoutesTableSummary `json:"value,omitempty"`
-	// NextLink - The URL to get the next set of results.
-	NextLink *string `json:"nextLink,omitempty"`
-}
-
-// ExpressRouteCircuitStats contains stats associated with the peering.
-type ExpressRouteCircuitStats struct {
-	autorest.Response `json:"-"`
-	// PrimarybytesIn - Gets BytesIn of the peering.
-	PrimarybytesIn *int64 `json:"primarybytesIn,omitempty"`
-	// PrimarybytesOut - Gets BytesOut of the peering.
-	PrimarybytesOut *int64 `json:"primarybytesOut,omitempty"`
-	// SecondarybytesIn - Gets BytesIn of the peering.
-	SecondarybytesIn *int64 `json:"secondarybytesIn,omitempty"`
-	// SecondarybytesOut - Gets BytesOut of the peering.
-	SecondarybytesOut *int64 `json:"secondarybytesOut,omitempty"`
-}
-
-// ExpressRouteCircuitsUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ExpressRouteCircuitsUpdateTagsFuture struct {
+// ExpressRouteCircuitsGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type ExpressRouteCircuitsGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsUpdateTagsFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) {
+func (future ExpressRouteCircuitsGroupUpdateTagsFuture) Result(client ExpressRouteCircuitsGroupClient) (erc ExpressRouteCircuit, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsUpdateTagsFuture")
+		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erc, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6089,16 +6381,59 @@ func (future ExpressRouteCircuitsUpdateTagsFuture) Result(client ExpressRouteCir
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erc, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
+type ExpressRouteCircuitSku struct {
+	// Name - The name of the SKU.
+	Name *string `json:"name,omitempty"`
+	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
+	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
+	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
+	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
+}
+
+// ExpressRouteCircuitsRoutesTableListResult response for ListRoutesTable associated with the Express Route
+// Circuits API.
+type ExpressRouteCircuitsRoutesTableListResult struct {
+	autorest.Response `json:"-"`
+	// Value - The list of routes table.
+	Value *[]ExpressRouteCircuitRoutesTable `json:"value,omitempty"`
+	// NextLink - The URL to get the next set of results.
+	NextLink *string `json:"nextLink,omitempty"`
+}
+
+// ExpressRouteCircuitsRoutesTableSummaryListResult response for ListRoutesTable associated with the Express Route
+// Circuits API.
+type ExpressRouteCircuitsRoutesTableSummaryListResult struct {
+	autorest.Response `json:"-"`
+	// Value - A list of the routes table.
+	Value *[]ExpressRouteCircuitRoutesTableSummary `json:"value,omitempty"`
+	// NextLink - The URL to get the next set of results.
+	NextLink *string `json:"nextLink,omitempty"`
+}
+
+// ExpressRouteCircuitStats contains stats associated with the peering.
+type ExpressRouteCircuitStats struct {
+	autorest.Response `json:"-"`
+	// PrimarybytesIn - Gets BytesIn of the peering.
+	PrimarybytesIn *int64 `json:"primarybytesIn,omitempty"`
+	// PrimarybytesOut - Gets BytesOut of the peering.
+	PrimarybytesOut *int64 `json:"primarybytesOut,omitempty"`
+	// SecondarybytesIn - Gets BytesIn of the peering.
+	SecondarybytesIn *int64 `json:"secondarybytesIn,omitempty"`
+	// SecondarybytesOut - Gets BytesOut of the peering.
+	SecondarybytesOut *int64 `json:"secondarybytesOut,omitempty"`
+}
+
 // ExpressRouteServiceProvider a ExpressRouteResourceProvider object.
 type ExpressRouteServiceProvider struct {
 	*ExpressRouteServiceProviderPropertiesFormat `json:"properties,omitempty"`
@@ -6772,29 +7107,29 @@ type InboundNatRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InboundNatRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type InboundNatRulesCreateOrUpdateFuture struct {
+// InboundNatRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type InboundNatRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesClient) (inr InboundNatRule, err error) {
+func (future InboundNatRulesGroupCreateOrUpdateFuture) Result(client InboundNatRulesGroupClient) (inr InboundNatRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesCreateOrUpdateFuture")
+		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		inr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6811,39 +7146,39 @@ func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	inr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InboundNatRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// InboundNatRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InboundNatRulesDeleteFuture struct {
+type InboundNatRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (ar autorest.Response, err error) {
+func (future InboundNatRulesGroupDeleteFuture) Result(client InboundNatRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6860,12 +7195,12 @@ func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -7437,29 +7772,29 @@ type InterfacePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InterfacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// InterfacesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InterfacesCreateOrUpdateFuture struct {
+type InterfacesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i Interface, err error) {
+func (future InterfacesGroupCreateOrUpdateFuture) Result(client InterfacesGroupClient) (i Interface, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return i, azure.NewAsyncOpIncompleteError("network.InterfacesCreateOrUpdateFuture")
+		return i, azure.NewAsyncOpIncompleteError("network.InterfacesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		i, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7476,38 +7811,39 @@ func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	i, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type InterfacesDeleteFuture struct {
+// InterfacesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type InterfacesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autorest.Response, err error) {
+func (future InterfacesGroupDeleteFuture) Result(client InterfacesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7524,39 +7860,39 @@ func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autores
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
+// InterfacesGroupGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type InterfacesGetEffectiveRouteTableFuture struct {
+type InterfacesGroupGetEffectiveRouteTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesClient) (erlr EffectiveRouteListResult, err error) {
+func (future InterfacesGroupGetEffectiveRouteTableFuture) Result(client InterfacesGroupClient) (erlr EffectiveRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGetEffectiveRouteTableFuture")
+		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupGetEffectiveRouteTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erlr, err = client.GetEffectiveRouteTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7573,39 +7909,39 @@ func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erlr, err = client.GetEffectiveRouteTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type InterfacesListEffectiveNetworkSecurityGroupsFuture struct {
+// InterfacesGroupListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type InterfacesGroupListEffectiveNetworkSecurityGroupsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
+func (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesGroupClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesListEffectiveNetworkSecurityGroupsFuture")
+		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7622,38 +7958,39 @@ func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client I
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type InterfacesUpdateTagsFuture struct {
+// InterfacesGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type InterfacesGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesUpdateTagsFuture) Result(client InterfacesClient) (i Interface, err error) {
+func (future InterfacesGroupUpdateTagsFuture) Result(client InterfacesGroupClient) (i Interface, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return i, azure.NewAsyncOpIncompleteError("network.InterfacesUpdateTagsFuture")
+		return i, azure.NewAsyncOpIncompleteError("network.InterfacesGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		i, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7670,12 +8007,12 @@ func (future InterfacesUpdateTagsFuture) Result(client InterfacesClient) (i Inte
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	i, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -8473,29 +8810,29 @@ type LoadBalancerPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LoadBalancersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type LoadBalancersCreateOrUpdateFuture struct {
+// LoadBalancersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type LoadBalancersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) {
+func (future LoadBalancersGroupCreateOrUpdateFuture) Result(client LoadBalancersGroupClient) (lb LoadBalancer, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersCreateOrUpdateFuture")
+		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lb, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8512,38 +8849,39 @@ func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lb, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LoadBalancersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type LoadBalancersDeleteFuture struct {
+// LoadBalancersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type LoadBalancersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar autorest.Response, err error) {
+func (future LoadBalancersGroupDeleteFuture) Result(client LoadBalancersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8560,45 +8898,39 @@ func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LoadBalancerSku SKU of a load balancer
-type LoadBalancerSku struct {
-	// Name - Name of a load balancer SKU. Possible values include: 'LoadBalancerSkuNameBasic', 'LoadBalancerSkuNameStandard'
-	Name LoadBalancerSkuName `json:"name,omitempty"`
-}
-
-// LoadBalancersUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// LoadBalancersGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type LoadBalancersUpdateTagsFuture struct {
+type LoadBalancersGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersUpdateTagsFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) {
+func (future LoadBalancersGroupUpdateTagsFuture) Result(client LoadBalancersGroupClient) (lb LoadBalancer, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersUpdateTagsFuture")
+		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lb, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8615,16 +8947,22 @@ func (future LoadBalancersUpdateTagsFuture) Result(client LoadBalancersClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lb, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// LoadBalancerSku SKU of a load balancer
+type LoadBalancerSku struct {
+	// Name - Name of a load balancer SKU. Possible values include: 'LoadBalancerSkuNameBasic', 'LoadBalancerSkuNameStandard'
+	Name LoadBalancerSkuName `json:"name,omitempty"`
+}
+
 // LoadBalancingRule a load balancing rule for a load balancer.
 type LoadBalancingRule struct {
 	autorest.Response `json:"-"`
@@ -8955,29 +9293,29 @@ type LocalNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LocalNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// LocalNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type LocalNetworkGatewaysCreateOrUpdateFuture struct {
+type LocalNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) {
+func (future LocalNetworkGatewaysGroupCreateOrUpdateFuture) Result(client LocalNetworkGatewaysGroupClient) (lng LocalNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysCreateOrUpdateFuture")
+		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8994,39 +9332,39 @@ func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetwor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LocalNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// LocalNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type LocalNetworkGatewaysDeleteFuture struct {
+type LocalNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future LocalNetworkGatewaysGroupDeleteFuture) Result(client LocalNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9043,39 +9381,39 @@ func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGateway
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LocalNetworkGatewaysUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type LocalNetworkGatewaysUpdateTagsFuture struct {
+// LocalNetworkGatewaysGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type LocalNetworkGatewaysGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysUpdateTagsFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) {
+func (future LocalNetworkGatewaysGroupUpdateTagsFuture) Result(client LocalNetworkGatewaysGroupClient) (lng LocalNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysUpdateTagsFuture")
+		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lng, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9092,12 +9430,12 @@ func (future LocalNetworkGatewaysUpdateTagsFuture) Result(client LocalNetworkGat
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lng, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -9593,28 +9931,29 @@ type PacketCaptureResultProperties struct {
 	Filters            *[]PacketCaptureFilter        `json:"filters,omitempty"`
 }
 
-// PacketCapturesCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesCreateFuture struct {
+// PacketCapturesGroupCreateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupCreateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pcr PacketCaptureResult, err error) {
+func (future PacketCapturesGroupCreateFuture) Result(client PacketCapturesGroupClient) (pcr PacketCaptureResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesCreateFuture")
+		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupCreateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcr, err = client.CreateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9631,38 +9970,39 @@ func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pc
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcr, err = client.CreateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesDeleteFuture struct {
+// PacketCapturesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupDeleteFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9679,39 +10019,39 @@ func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// PacketCapturesGroupGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PacketCapturesGetStatusFuture struct {
+type PacketCapturesGroupGetStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
+func (future PacketCapturesGroupGetStatusFuture) Result(client PacketCapturesGroupClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGetStatusFuture")
+		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupGetStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcqsr, err = client.GetStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9728,38 +10068,39 @@ func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcqsr, err = client.GetStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesStopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesStopFuture struct {
+// PacketCapturesGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupStopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupStopFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesStopFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupStopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9776,12 +10117,12 @@ func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10242,29 +10583,29 @@ type PublicIPAddressDNSSettings struct {
 	ReverseFqdn *string `json:"reverseFqdn,omitempty"`
 }
 
-// PublicIPAddressesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type PublicIPAddressesCreateOrUpdateFuture struct {
+// PublicIPAddressesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type PublicIPAddressesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) {
+func (future PublicIPAddressesGroupCreateOrUpdateFuture) Result(client PublicIPAddressesGroupClient) (pia PublicIPAddress, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesCreateOrUpdateFuture")
+		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pia, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10281,39 +10622,39 @@ func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pia, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PublicIPAddressesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// PublicIPAddressesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PublicIPAddressesDeleteFuture struct {
+type PublicIPAddressesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClient) (ar autorest.Response, err error) {
+func (future PublicIPAddressesGroupDeleteFuture) Result(client PublicIPAddressesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10330,39 +10671,39 @@ func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PublicIPAddressesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type PublicIPAddressesUpdateTagsFuture struct {
+// PublicIPAddressesGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type PublicIPAddressesGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesUpdateTagsFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) {
+func (future PublicIPAddressesGroupUpdateTagsFuture) Result(client PublicIPAddressesGroupClient) (pia PublicIPAddress, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesUpdateTagsFuture")
+		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pia, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10379,12 +10720,12 @@ func (future PublicIPAddressesUpdateTagsFuture) Result(client PublicIPAddressesC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pia, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11161,29 +11502,29 @@ type RouteFilterRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteFilterRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type RouteFilterRulesCreateOrUpdateFuture struct {
+// RouteFilterRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type RouteFilterRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupCreateOrUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesCreateOrUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11200,39 +11541,39 @@ func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRule
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesDeleteFuture struct {
+type RouteFilterRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) (ar autorest.Response, err error) {
+func (future RouteFilterRulesGroupDeleteFuture) Result(client RouteFilterRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11249,39 +11590,39 @@ func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesUpdateFuture struct {
+type RouteFilterRulesGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11298,39 +11639,39 @@ func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFiltersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFiltersCreateOrUpdateFuture struct {
+type RouteFiltersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupCreateOrUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersCreateOrUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11347,38 +11688,39 @@ func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersDeleteFuture struct {
+// RouteFiltersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar autorest.Response, err error) {
+func (future RouteFiltersGroupDeleteFuture) Result(client RouteFiltersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11395,38 +11737,39 @@ func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar aut
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersUpdateFuture struct {
+// RouteFiltersGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11443,12 +11786,12 @@ func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf Rou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11567,28 +11910,29 @@ type RoutePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RoutesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesCreateOrUpdateFuture struct {
+// RoutesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RoutesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, err error) {
+func (future RoutesGroupCreateOrUpdateFuture) Result(client RoutesGroupClient) (r Route, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return r, azure.NewAsyncOpIncompleteError("network.RoutesCreateOrUpdateFuture")
+		return r, azure.NewAsyncOpIncompleteError("network.RoutesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		r, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11605,38 +11949,38 @@ func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, e
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	r, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RoutesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesDeleteFuture struct {
+// RoutesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type RoutesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Response, err error) {
+func (future RoutesGroupDeleteFuture) Result(client RoutesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RoutesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RoutesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11653,12 +11997,12 @@ func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Respon
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11901,29 +12245,29 @@ type RouteTablePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteTablesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteTablesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteTablesCreateOrUpdateFuture struct {
+type RouteTablesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (rt RouteTable, err error) {
+func (future RouteTablesGroupCreateOrUpdateFuture) Result(client RouteTablesGroupClient) (rt RouteTable, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesCreateOrUpdateFuture")
+		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rt, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11940,38 +12284,39 @@ func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rt, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteTablesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteTablesDeleteFuture struct {
+// RouteTablesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteTablesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autorest.Response, err error) {
+func (future RouteTablesGroupDeleteFuture) Result(client RouteTablesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11988,39 +12333,39 @@ func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteTablesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteTablesGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteTablesUpdateTagsFuture struct {
+type RouteTablesGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesUpdateTagsFuture) Result(client RouteTablesClient) (rt RouteTable, err error) {
+func (future RouteTablesGroupUpdateTagsFuture) Result(client RouteTablesGroupClient) (rt RouteTable, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesUpdateTagsFuture")
+		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rt, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12037,12 +12382,12 @@ func (future RouteTablesUpdateTagsFuture) Result(client RouteTablesClient) (rt R
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rt, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12296,29 +12641,29 @@ type SecurityGroupPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityGroupsCreateOrUpdateFuture struct {
+// SecurityGroupsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityGroupsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) {
+func (future SecurityGroupsGroupCreateOrUpdateFuture) Result(client SecurityGroupsGroupClient) (sg SecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsCreateOrUpdateFuture")
+		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sg, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12335,38 +12680,39 @@ func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sg, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityGroupsDeleteFuture struct {
+// SecurityGroupsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityGroupsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar autorest.Response, err error) {
+func (future SecurityGroupsGroupDeleteFuture) Result(client SecurityGroupsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12383,39 +12729,39 @@ func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityGroupsUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// SecurityGroupsGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type SecurityGroupsUpdateTagsFuture struct {
+type SecurityGroupsGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsUpdateTagsFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) {
+func (future SecurityGroupsGroupUpdateTagsFuture) Result(client SecurityGroupsGroupClient) (sg SecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsUpdateTagsFuture")
+		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sg, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12432,12 +12778,12 @@ func (future SecurityGroupsUpdateTagsFuture) Result(client SecurityGroupsClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sg, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12668,29 +13014,29 @@ type SecurityRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityRulesCreateOrUpdateFuture struct {
+// SecurityRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClient) (sr SecurityRule, err error) {
+func (future SecurityRulesGroupCreateOrUpdateFuture) Result(client SecurityRulesGroupClient) (sr SecurityRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesCreateOrUpdateFuture")
+		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12707,38 +13053,39 @@ func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityRulesDeleteFuture struct {
+// SecurityRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar autorest.Response, err error) {
+func (future SecurityRulesGroupDeleteFuture) Result(client SecurityRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12755,12 +13102,12 @@ func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12973,29 +13320,29 @@ type SubnetPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SubnetsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// SubnetsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type SubnetsCreateOrUpdateFuture struct {
+type SubnetsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet, err error) {
+func (future SubnetsGroupCreateOrUpdateFuture) Result(client SubnetsGroupClient) (s Subnet, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.SubnetsCreateOrUpdateFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.SubnetsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13012,38 +13359,38 @@ func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SubnetsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SubnetsDeleteFuture struct {
+// SubnetsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type SubnetsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Response, err error) {
+func (future SubnetsGroupDeleteFuture) Result(client SubnetsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13060,12 +13407,12 @@ func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Resp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -14070,29 +14417,29 @@ type VirtualNetworkGatewayConnectionPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewayConnectionsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsCreateOrUpdateFuture struct {
+// VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngc VirtualNetworkGatewayConnection, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (vngc VirtualNetworkGatewayConnection, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture")
+		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vngc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14109,39 +14456,39 @@ func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vngc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewayConnectionsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewayConnectionsDeleteFuture struct {
+type VirtualNetworkGatewayConnectionsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client VirtualNetworkGatewayConnectionsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupDeleteFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14158,39 +14505,39 @@ func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsResetSharedKeyFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsResetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (crsk ConnectionResetSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (crsk ConnectionResetSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture")
+		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		crsk, err = client.ResetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14207,39 +14554,39 @@ func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	crsk, err = client.ResetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsSetSharedKeyFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewayConnectionsSetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (csk ConnectionSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (csk ConnectionSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture")
+		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		csk, err = client.SetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14256,39 +14603,39 @@ func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client V
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	csk, err = client.SetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewayConnectionsUpdateTagsFuture struct {
+// VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsUpdateTagsFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngcle VirtualNetworkGatewayConnectionListEntity, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (vngcle VirtualNetworkGatewayConnectionListEntity, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vngcle, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsUpdateTagsFuture")
+		return vngcle, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vngcle, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14305,12 +14652,12 @@ func (future VirtualNetworkGatewayConnectionsUpdateTagsFuture) Result(client Vir
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vngcle, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -14623,29 +14970,29 @@ type VirtualNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysCreateOrUpdateFuture struct {
+type VirtualNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysCreateOrUpdateFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14662,39 +15009,39 @@ func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysDeleteFuture struct {
+// VirtualNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewaysGroupDeleteFuture) Result(client VirtualNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14711,39 +15058,39 @@ func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGat
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewaysGeneratevpnclientpackageFuture struct {
+// VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GeneratevpnclientpackageResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14760,39 +15107,39 @@ func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GeneratevpnclientpackageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGenerateVpnProfileFuture struct {
+// VirtualNetworkGatewaysGroupGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGenerateVpnProfileFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGenerateVpnProfileFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GenerateVpnProfileResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14809,39 +15156,39 @@ func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client Virtu
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GenerateVpnProfileResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGetAdvertisedRoutesFuture struct {
+// VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetAdvertisedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14858,39 +15205,39 @@ func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client Virt
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetAdvertisedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetBgpPeerStatusFuture struct {
+type VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysClient) (bpslr BgpPeerStatusListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysGroupClient) (bpslr BgpPeerStatusListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetBgpPeerStatusFuture")
+		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		bpslr, err = client.GetBgpPeerStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14907,39 +15254,39 @@ func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	bpslr, err = client.GetBgpPeerStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetLearnedRoutesFuture struct {
+type VirtualNetworkGatewaysGroupGetLearnedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetLearnedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetLearnedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14956,39 +15303,39 @@ func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetLearnedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetVpnProfilePackageURLFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewaysGetVpnProfilePackageURLFuture struct {
+// VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GetVpnProfilePackageURLResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15005,49 +15352,39 @@ func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GetVpnProfilePackageURLResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
-type VirtualNetworkGatewaySku struct {
-	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
-	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
-	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
-	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
-	// Capacity - The capacity.
-	Capacity *int32 `json:"capacity,omitempty"`
-}
-
-// VirtualNetworkGatewaysResetFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysResetFuture struct {
+// VirtualNetworkGatewaysGroupResetFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupResetFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupResetFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysResetFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupResetFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.ResetResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15064,39 +15401,39 @@ func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGate
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.ResetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysUpdateTagsFuture struct {
+type VirtualNetworkGatewaysGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysUpdateTagsFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupUpdateTagsFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysUpdateTagsFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15113,16 +15450,26 @@ func (future VirtualNetworkGatewaysUpdateTagsFuture) Result(client VirtualNetwor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
+type VirtualNetworkGatewaySku struct {
+	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
+	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
+	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
+	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
+	// Capacity - The capacity.
+	Capacity *int32 `json:"capacity,omitempty"`
+}
+
 // VirtualNetworkListResult response for the ListVirtualNetworks API service call.
 type VirtualNetworkListResult struct {
 	autorest.Response `json:"-"`
@@ -15514,29 +15861,29 @@ type VirtualNetworkPeeringPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkPeeringsCreateOrUpdateFuture struct {
+type VirtualNetworkPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsClient) (vnp VirtualNetworkPeering, err error) {
+func (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsGroupClient) (vnp VirtualNetworkPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsCreateOrUpdateFuture")
+		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vnp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15553,39 +15900,39 @@ func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vnp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkPeeringsDeleteFuture struct {
+// VirtualNetworkPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPeeringsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkPeeringsGroupDeleteFuture) Result(client VirtualNetworkPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15602,12 +15949,12 @@ func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPee
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -15632,29 +15979,29 @@ type VirtualNetworkPropertiesFormat struct {
 	EnableVMProtection *bool `json:"enableVmProtection,omitempty"`
 }
 
-// VirtualNetworksCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworksCreateOrUpdateFuture struct {
+// VirtualNetworksGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworksGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) {
+func (future VirtualNetworksGroupCreateOrUpdateFuture) Result(client VirtualNetworksGroupClient) (vn VirtualNetwork, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksCreateOrUpdateFuture")
+		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vn, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15671,39 +16018,39 @@ func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vn, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworksDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// VirtualNetworksGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type VirtualNetworksDeleteFuture struct {
+type VirtualNetworksGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (ar autorest.Response, err error) {
+func (future VirtualNetworksGroupDeleteFuture) Result(client VirtualNetworksGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15720,39 +16067,39 @@ func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworksUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// VirtualNetworksGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type VirtualNetworksUpdateTagsFuture struct {
+type VirtualNetworksGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksUpdateTagsFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) {
+func (future VirtualNetworksGroupUpdateTagsFuture) Result(client VirtualNetworksGroupClient) (vn VirtualNetwork, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksUpdateTagsFuture")
+		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vn, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15769,12 +16116,12 @@ func (future VirtualNetworksUpdateTagsFuture) Result(client VirtualNetworksClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vn, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -16117,29 +16464,29 @@ type WatcherPropertiesFormat struct {
 	ProvisioningState ProvisioningState `json:"provisioningState,omitempty"`
 }
 
-// WatchersCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersCheckConnectivityFuture struct {
+type WatchersGroupCheckConnectivityFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci ConnectivityInformation, err error) {
+func (future WatchersGroupCheckConnectivityFuture) Result(client WatchersGroupClient) (ci ConnectivityInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ci, azure.NewAsyncOpIncompleteError("network.WatchersCheckConnectivityFuture")
+		return ci, azure.NewAsyncOpIncompleteError("network.WatchersGroupCheckConnectivityFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ci, err = client.CheckConnectivityResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16156,38 +16503,38 @@ func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ci, err = client.CheckConnectivityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersDeleteFuture struct {
+// WatchersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type WatchersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Response, err error) {
+func (future WatchersGroupDeleteFuture) Result(client WatchersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.WatchersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.WatchersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16204,39 +16551,39 @@ func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Re
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetAzureReachabilityReportFuture an abstraction for monitoring and retrieving the results of a
+// WatchersGroupGetAzureReachabilityReportFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type WatchersGetAzureReachabilityReportFuture struct {
+type WatchersGroupGetAzureReachabilityReportFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetAzureReachabilityReportFuture) Result(client WatchersClient) (arr AzureReachabilityReport, err error) {
+func (future WatchersGroupGetAzureReachabilityReportFuture) Result(client WatchersGroupClient) (arr AzureReachabilityReport, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return arr, azure.NewAsyncOpIncompleteError("network.WatchersGetAzureReachabilityReportFuture")
+		return arr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetAzureReachabilityReportFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		arr, err = client.GetAzureReachabilityReportResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16253,39 +16600,39 @@ func (future WatchersGetAzureReachabilityReportFuture) Result(client WatchersCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	arr, err = client.GetAzureReachabilityReportResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetFlowLogStatusFuture struct {
+type WatchersGroupGetFlowLogStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupGetFlowLogStatusFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGetFlowLogStatusFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetFlowLogStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.GetFlowLogStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16302,38 +16649,39 @@ func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.GetFlowLogStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersGetNextHopFuture struct {
+// WatchersGroupGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupGetNextHopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHopResult, err error) {
+func (future WatchersGroupGetNextHopFuture) Result(client WatchersGroupClient) (nhr NextHopResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGetNextHopFuture")
+		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetNextHopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		nhr, err = client.GetNextHopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16350,39 +16698,39 @@ func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHo
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	nhr, err = client.GetNextHopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetTroubleshootingFuture struct {
+type WatchersGroupGetTroubleshootingFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16399,39 +16747,39 @@ func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
+// WatchersGroupGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type WatchersGetTroubleshootingResultFuture struct {
+type WatchersGroupGetTroubleshootingResultFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingResultFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingResultFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingResultFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResultResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16448,39 +16796,39 @@ func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResultResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetVMSecurityRulesFuture struct {
+type WatchersGroupGetVMSecurityRulesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sgvr SecurityGroupViewResult, err error) {
+func (future WatchersGroupGetVMSecurityRulesFuture) Result(client WatchersGroupClient) (sgvr SecurityGroupViewResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGetVMSecurityRulesFuture")
+		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetVMSecurityRulesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sgvr, err = client.GetVMSecurityRulesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16497,39 +16845,39 @@ func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sg
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sgvr, err = client.GetVMSecurityRulesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersListAvailableProvidersFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type WatchersListAvailableProvidersFuture struct {
+// WatchersGroupListAvailableProvidersFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type WatchersGroupListAvailableProvidersFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersListAvailableProvidersFuture) Result(client WatchersClient) (apl AvailableProvidersList, err error) {
+func (future WatchersGroupListAvailableProvidersFuture) Result(client WatchersGroupClient) (apl AvailableProvidersList, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return apl, azure.NewAsyncOpIncompleteError("network.WatchersListAvailableProvidersFuture")
+		return apl, azure.NewAsyncOpIncompleteError("network.WatchersGroupListAvailableProvidersFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		apl, err = client.ListAvailableProvidersResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16546,39 +16894,39 @@ func (future WatchersListAvailableProvidersFuture) Result(client WatchersClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	apl, err = client.ListAvailableProvidersResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type WatchersSetFlowLogConfigurationFuture struct {
+// WatchersGroupSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type WatchersGroupSetFlowLogConfigurationFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupSetFlowLogConfigurationFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersSetFlowLogConfigurationFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupSetFlowLogConfigurationFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.SetFlowLogConfigurationResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16595,38 +16943,39 @@ func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.SetFlowLogConfigurationResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersVerifyIPFlowFuture struct {
+// WatchersGroupVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupVerifyIPFlowFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr VerificationIPFlowResult, err error) {
+func (future WatchersGroupVerifyIPFlowFuture) Result(client WatchersGroupClient) (vifr VerificationIPFlowResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersVerifyIPFlowFuture")
+		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersGroupVerifyIPFlowFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vifr, err = client.VerifyIPFlowResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16643,12 +16992,12 @@ func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr Ver
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vifr, err = client.VerifyIPFlowResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/operations.go b/services/network/mgmt/2017-10-01/network/operationsgroup.go
similarity index 60%
rename from services/network/mgmt/2017-10-01/network/operations.go
rename to services/network/mgmt/2017-10-01/network/operationsgroup.go
index 9c0a938b4db5..90f4c8e48c05 100644
--- a/services/network/mgmt/2017-10-01/network/operations.go
+++ b/services/network/mgmt/2017-10-01/network/operationsgroup.go
@@ -24,47 +24,47 @@ import (
 	"net/http"
 )
 
-// OperationsClient is the network Client
-type OperationsClient struct {
+// OperationsGroupClient is the network Client
+type OperationsGroupClient struct {
 	BaseClient
 }
 
-// NewOperationsClient creates an instance of the OperationsClient client.
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewOperationsGroupClient creates an instance of the OperationsGroupClient client.
+func NewOperationsGroupClient(subscriptionID string) OperationsGroupClient {
+	return NewOperationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client.
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewOperationsGroupClientWithBaseURI creates an instance of the OperationsGroupClient client.
+func NewOperationsGroupClientWithBaseURI(baseURI string, subscriptionID string) OperationsGroupClient {
+	return OperationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List lists all of the available Network Rest API operations.
-func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) {
+func (client OperationsGroupClient) List(ctx context.Context) (result OperationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.olr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.olr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client OperationsGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	const APIVersion = "2017-10-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
@@ -80,14 +80,14 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client OperationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) {
+func (client OperationsGroupClient) ListResponder(resp *http.Response) (result OperationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -99,10 +99,10 @@ func (client OperationsClient) ListResponder(resp *http.Response) (result Operat
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client OperationsClient) listNextResults(lastResults OperationListResult) (result OperationListResult, err error) {
+func (client OperationsGroupClient) listNextResults(lastResults OperationListResult) (result OperationListResult, err error) {
 	req, err := lastResults.operationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.OperationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.OperationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -110,17 +110,17 @@ func (client OperationsClient) listNextResults(lastResults OperationListResult)
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.OperationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.OperationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) {
+func (client OperationsGroupClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/packetcaptures.go b/services/network/mgmt/2017-10-01/network/packetcapturesgroup.go
similarity index 71%
rename from services/network/mgmt/2017-10-01/network/packetcaptures.go
rename to services/network/mgmt/2017-10-01/network/packetcapturesgroup.go
index 4020036199ca..58d4a5a26968 100644
--- a/services/network/mgmt/2017-10-01/network/packetcaptures.go
+++ b/services/network/mgmt/2017-10-01/network/packetcapturesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// PacketCapturesClient is the network Client
-type PacketCapturesClient struct {
+// PacketCapturesGroupClient is the network Client
+type PacketCapturesGroupClient struct {
 	BaseClient
 }
 
-// NewPacketCapturesClient creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
-	return NewPacketCapturesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPacketCapturesGroupClient creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClient(subscriptionID string) PacketCapturesGroupClient {
+	return NewPacketCapturesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPacketCapturesClientWithBaseURI creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
-	return PacketCapturesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPacketCapturesGroupClientWithBaseURI creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesGroupClient {
+	return PacketCapturesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Create create and start a packet capture on the specified VM.
@@ -45,25 +45,25 @@ func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) P
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session. parameters is parameters that define the create
 // packet capture operation.
-func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesGroupCreateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PacketCaptureParameters", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.PacketCaptureParameters.Target", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "parameters.PacketCaptureParameters.StorageLocation", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PacketCapturesClient", "Create", err.Error())
+		return result, validation.NewError("network.PacketCapturesGroupClient", "Create", err.Error())
 	}
 
 	req, err := client.CreatePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName
 }
 
 // CreatePreparer prepares the Create request.
-func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
+func (client PacketCapturesGroupClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -96,7 +96,7 @@ func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceG
 
 // CreateSender sends the Create request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) CreateSender(req *http.Request) (future PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) CreateSender(req *http.Request) (future PacketCapturesGroupCreateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PacketCapturesClient) CreateSender(req *http.Request) (future Packe
 
 // CreateResponder handles the response to the Create request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -166,7 +166,7 @@ func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) DeleteSender(req *http.Request) (future PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) DeleteSender(req *http.Request) (future PacketCapturesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client PacketCapturesClient) DeleteSender(req *http.Request) (future Packe
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -241,14 +241,14 @@ func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -263,16 +263,16 @@ func (client PacketCapturesClient) GetResponder(resp *http.Response) (result Pac
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource. packetCaptureName is the name given to the packet capture session.
-func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupGetStatusFuture, err error) {
 	req, err := client.GetStatusPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -280,7 +280,7 @@ func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupN
 }
 
 // GetStatusPreparer prepares the GetStatus request.
-func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -303,7 +303,7 @@ func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resour
 
 // GetStatusSender sends the GetStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatusSender(req *http.Request) (future PacketCapturesGroupGetStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -318,7 +318,7 @@ func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future Pa
 
 // GetStatusResponder handles the response to the GetStatus request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
+func (client PacketCapturesGroupClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource.
-func (client PacketCapturesClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -378,14 +378,14 @@ func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -400,16 +400,16 @@ func (client PacketCapturesClient) ListResponder(resp *http.Response) (result Pa
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -417,7 +417,7 @@ func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName s
 }
 
 // StopPreparer prepares the Stop request.
-func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -440,7 +440,7 @@ func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGro
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) StopSender(req *http.Request) (future PacketCapturesGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -455,7 +455,7 @@ func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketC
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/publicipaddresses.go b/services/network/mgmt/2017-10-01/network/publicipaddressesgroup.go
similarity index 70%
rename from services/network/mgmt/2017-10-01/network/publicipaddresses.go
rename to services/network/mgmt/2017-10-01/network/publicipaddressesgroup.go
index 21210ef64ba1..8e35b915779a 100644
--- a/services/network/mgmt/2017-10-01/network/publicipaddresses.go
+++ b/services/network/mgmt/2017-10-01/network/publicipaddressesgroup.go
@@ -25,26 +25,26 @@ import (
 	"net/http"
 )
 
-// PublicIPAddressesClient is the network Client
-type PublicIPAddressesClient struct {
+// PublicIPAddressesGroupClient is the network Client
+type PublicIPAddressesGroupClient struct {
 	BaseClient
 }
 
-// NewPublicIPAddressesClient creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
-	return NewPublicIPAddressesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPublicIPAddressesGroupClient creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClient(subscriptionID string) PublicIPAddressesGroupClient {
+	return NewPublicIPAddressesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPublicIPAddressesClientWithBaseURI creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
-	return PublicIPAddressesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPublicIPAddressesGroupClientWithBaseURI creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesGroupClient {
+	return PublicIPAddressesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a static or dynamic public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address.
 // parameters is parameters supplied to the create or update public IP address operation.
-func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat", Name: validation.Null, Rule: false,
@@ -53,18 +53,18 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 						Chain: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat.IPConfiguration.IPConfigurationPropertiesFormat.PublicIPAddress", Name: validation.Null, Rule: false, Chain: nil}}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PublicIPAddressesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.PublicIPAddressesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, publicIPAddressName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -72,7 +72,7 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -96,7 +96,7 @@ func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (f
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -125,16 +125,16 @@ func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Respons
 // Delete deletes the specified public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet.
-func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, publicIPAddressName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -142,7 +142,7 @@ func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupN
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -164,7 +164,7 @@ func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resour
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) DeleteSender(req *http.Request) (future PublicIPAddressesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -179,7 +179,7 @@ func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future Pu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PublicIPAddressesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -193,30 +193,30 @@ func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet. expand is
 // expands referenced resources.
-func (client PublicIPAddressesClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -241,14 +241,14 @@ func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceG
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -265,30 +265,30 @@ func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. IPConfigurationName is the name of the IP configuration. publicIPAddressName is the name of
 // the public IP Address. expand is expands referenced resources.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetPublicIPAddressSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetPublicIPAddressResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressPreparer prepares the GetVirtualMachineScaleSetPublicIPAddress request.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -317,14 +317,14 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPr
 
 // GetVirtualMachineScaleSetPublicIPAddressSender sends the GetVirtualMachineScaleSetPublicIPAddress request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressResponder handles the response to the GetVirtualMachineScaleSetPublicIPAddress request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -338,31 +338,31 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressRe
 // List gets all public IP addresses in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client PublicIPAddressesClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -383,14 +383,14 @@ func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resource
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -402,10 +402,10 @@ func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -413,47 +413,47 @@ func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddres
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the public IP addresses in a subscription.
-func (client PublicIPAddressesClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -473,14 +473,14 @@ func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*htt
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -492,10 +492,10 @@ func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (res
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -503,17 +503,17 @@ func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAdd
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -523,31 +523,31 @@ func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (resu
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -569,14 +569,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 
 // ListVirtualMachineScaleSetPublicIPAddressesSender sends the ListVirtualMachineScaleSetPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -588,10 +588,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 }
 
 // listVirtualMachineScaleSetPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -599,17 +599,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddresse
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -620,31 +620,31 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the network
 // interface name. IPConfigurationName is the IP configuration name.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetVMPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -669,14 +669,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesSender sends the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -688,10 +688,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 }
 
 // listVirtualMachineScaleSetVMPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -699,17 +699,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddres
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	return
 }
@@ -718,16 +718,16 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address.
 // parameters is parameters supplied to update public IP address tags.
-func (client PublicIPAddressesClient) UpdateTags(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (result PublicIPAddressesUpdateTagsFuture, err error) {
+func (client PublicIPAddressesGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (result PublicIPAddressesGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, publicIPAddressName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -735,7 +735,7 @@ func (client PublicIPAddressesClient) UpdateTags(ctx context.Context, resourceGr
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client PublicIPAddressesClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -759,7 +759,7 @@ func (client PublicIPAddressesClient) UpdateTagsPreparer(ctx context.Context, re
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) UpdateTagsSender(req *http.Request) (future PublicIPAddressesUpdateTagsFuture, err error) {
+func (client PublicIPAddressesGroupClient) UpdateTagsSender(req *http.Request) (future PublicIPAddressesGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -774,7 +774,7 @@ func (client PublicIPAddressesClient) UpdateTagsSender(req *http.Request) (futur
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) UpdateTagsResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) UpdateTagsResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/routefilterrules.go b/services/network/mgmt/2017-10-01/network/routefilterrulesgroup.go
similarity index 72%
rename from services/network/mgmt/2017-10-01/network/routefilterrules.go
rename to services/network/mgmt/2017-10-01/network/routefilterrulesgroup.go
index 1ca4893756e4..341f3d032908 100644
--- a/services/network/mgmt/2017-10-01/network/routefilterrules.go
+++ b/services/network/mgmt/2017-10-01/network/routefilterrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// RouteFilterRulesClient is the network Client
-type RouteFilterRulesClient struct {
+// RouteFilterRulesGroupClient is the network Client
+type RouteFilterRulesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFilterRulesClient creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClient(subscriptionID string) RouteFilterRulesClient {
-	return NewRouteFilterRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFilterRulesGroupClient creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClient(subscriptionID string) RouteFilterRulesGroupClient {
+	return NewRouteFilterRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFilterRulesClientWithBaseURI creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesClient {
-	return RouteFilterRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFilterRulesGroupClientWithBaseURI creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesGroupClient {
+	return RouteFilterRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route filter.
@@ -45,25 +45,25 @@ func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the create or update
 // route filter rule operation.
-func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: routeFilterRuleParameters,
 			Constraints: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.RouteFilterRuleType", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.Communities", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.RouteFilterRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.RouteFilterRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourc
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -96,7 +96,7 @@ func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (fu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupNa
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -166,7 +166,7 @@ func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourc
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) DeleteSender(req *http.Request) (future RouteFilterRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future Rou
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFilterRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (resul
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -241,14 +241,14 @@ func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGr
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -262,31 +262,31 @@ func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result R
 // ListByRouteFilter gets all RouteFilterRules in a route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFilterRulesClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
 	result.fn = client.listByRouteFilterNextResults
 	req, err := client.ListByRouteFilterPreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.rfrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure sending request")
 		return
 	}
 
 	result.rfrlr, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByRouteFilterPreparer prepares the ListByRouteFilter request.
-func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -308,14 +308,14 @@ func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Conte
 
 // ListByRouteFilterSender sends the ListByRouteFilter request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByRouteFilterResponder handles the response to the ListByRouteFilter request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -327,10 +327,10 @@ func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Respo
 }
 
 // listByRouteFilterNextResults retrieves the next set of results, if any.
-func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
 	req, err := lastResults.routeFilterRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -338,17 +338,17 @@ func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults Ro
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByRouteFilterComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
 	result.page, err = client.ListByRouteFilter(ctx, resourceGroupName, routeFilterName)
 	return
 }
@@ -358,16 +358,16 @@ func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Conte
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the update route
 // filter rule operation.
-func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -375,7 +375,7 @@ func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupNa
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -400,7 +400,7 @@ func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourc
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) UpdateSender(req *http.Request) (future RouteFilterRulesGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -415,7 +415,7 @@ func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future Rou
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/routefilters.go b/services/network/mgmt/2017-10-01/network/routefiltersgroup.go
similarity index 66%
rename from services/network/mgmt/2017-10-01/network/routefilters.go
rename to services/network/mgmt/2017-10-01/network/routefiltersgroup.go
index a1c8cc37d8e5..26726ab9d060 100644
--- a/services/network/mgmt/2017-10-01/network/routefilters.go
+++ b/services/network/mgmt/2017-10-01/network/routefiltersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteFiltersClient is the network Client
-type RouteFiltersClient struct {
+// RouteFiltersGroupClient is the network Client
+type RouteFiltersGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFiltersClient creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
-	return NewRouteFiltersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFiltersGroupClient creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClient(subscriptionID string) RouteFiltersGroupClient {
+	return NewRouteFiltersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFiltersClientWithBaseURI creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
-	return RouteFiltersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFiltersGroupClientWithBaseURI creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersGroupClient {
+	return RouteFiltersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route filter in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the create or update route filter operation.
-func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGro
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -84,7 +84,7 @@ func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, res
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (r
 // Delete deletes the specified route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName s
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -152,7 +152,7 @@ func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGro
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) DeleteSender(req *http.Request) (future RouteFiltersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFiltersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result au
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. expand is
 // expands referenced express route bgp peering resources.
-func (client RouteFiltersClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -229,14 +229,14 @@ func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupN
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -248,31 +248,31 @@ func (client RouteFiltersClient) GetResponder(resp *http.Response) (result Route
 }
 
 // List gets all route filters in a subscription.
-func (client RouteFiltersClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -292,14 +292,14 @@ func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Reques
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -311,10 +311,10 @@ func (client RouteFiltersClient) ListResponder(resp *http.Response) (result Rout
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -322,17 +322,17 @@ func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResu
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
@@ -340,31 +340,31 @@ func (client RouteFiltersClient) ListComplete(ctx context.Context) (result Route
 // ListByResourceGroup gets all route filters in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteFiltersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listByResourceGroupNextResults
 	req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByResourceGroupPreparer prepares the ListByResourceGroup request.
-func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -385,14 +385,14 @@ func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context
 
 // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Respons
 }
 
 // listByResourceGroupNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults Rout
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.ListByResourceGroup(ctx, resourceGroupName)
 	return
 }
@@ -434,16 +434,16 @@ func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the update route filter operation.
-func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName s
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -475,7 +475,7 @@ func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGro
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) UpdateSender(req *http.Request) (future RouteFiltersGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFi
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/routes.go b/services/network/mgmt/2017-10-01/network/routesgroup.go
similarity index 69%
rename from services/network/mgmt/2017-10-01/network/routes.go
rename to services/network/mgmt/2017-10-01/network/routesgroup.go
index 2d74e31e737e..bf1fe009f680 100644
--- a/services/network/mgmt/2017-10-01/network/routes.go
+++ b/services/network/mgmt/2017-10-01/network/routesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RoutesClient is the network Client
-type RoutesClient struct {
+// RoutesGroupClient is the network Client
+type RoutesGroupClient struct {
 	BaseClient
 }
 
-// NewRoutesClient creates an instance of the RoutesClient client.
-func NewRoutesClient(subscriptionID string) RoutesClient {
-	return NewRoutesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRoutesGroupClient creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClient(subscriptionID string) RoutesGroupClient {
+	return NewRoutesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRoutesClientWithBaseURI creates an instance of the RoutesClient client.
-func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
-	return RoutesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRoutesGroupClientWithBaseURI creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClientWithBaseURI(baseURI string, subscriptionID string) RoutesGroupClient {
+	return RoutesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route. routeParameters is parameters supplied to the create or update route operation.
-func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, routeName, routeParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
+func (client RoutesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -85,7 +85,7 @@ func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceG
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdateSender(req *http.Request) (future RoutesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -100,7 +100,7 @@ func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future Route
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -115,16 +115,16 @@ func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -132,7 +132,7 @@ func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -155,7 +155,7 @@ func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) DeleteSender(req *http.Request) (future RoutesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -170,7 +170,7 @@ func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteF
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RoutesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -184,30 +184,30 @@ func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
+func (client RoutesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -230,14 +230,14 @@ func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName st
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) GetResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err
 // List gets all routes in a route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RoutesClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
+func (client RoutesGroupClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RoutesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -297,14 +297,14 @@ func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName s
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
+func (client RoutesGroupClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -316,10 +316,10 @@ func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListR
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RoutesClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
+func (client RoutesGroupClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
 	req, err := lastResults.routeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -327,17 +327,17 @@ func (client RoutesClient) listNextResults(lastResults RouteListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RoutesClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
+func (client RoutesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, routeTableName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/routetables.go b/services/network/mgmt/2017-10-01/network/routetablesgroup.go
similarity index 66%
rename from services/network/mgmt/2017-10-01/network/routetables.go
rename to services/network/mgmt/2017-10-01/network/routetablesgroup.go
index 25bf9394caa3..059ab39ae6e0 100644
--- a/services/network/mgmt/2017-10-01/network/routetables.go
+++ b/services/network/mgmt/2017-10-01/network/routetablesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteTablesClient is the network Client
-type RouteTablesClient struct {
+// RouteTablesGroupClient is the network Client
+type RouteTablesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteTablesClient creates an instance of the RouteTablesClient client.
-func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
-	return NewRouteTablesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteTablesGroupClient creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClient(subscriptionID string) RouteTablesGroupClient {
+	return NewRouteTablesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteTablesClientWithBaseURI creates an instance of the RouteTablesClient client.
-func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
-	return RouteTablesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteTablesGroupClientWithBaseURI creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesGroupClient {
+	return RouteTablesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate create or updates a route table in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters
 // is parameters supplied to the create or update route table operation.
-func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGrou
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
+func (client RouteTablesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -84,7 +84,7 @@ func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, reso
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (re
 // Delete deletes the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName st
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -152,7 +152,7 @@ func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGrou
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) DeleteSender(req *http.Request) (future RouteTablesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTab
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteTablesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result aut
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. expand is
 // expands referenced resources.
-func (client RouteTablesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
+func (client RouteTablesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -229,14 +229,14 @@ func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupNa
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteT
 // List gets all route tables in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteTablesClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupN
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client RouteTablesClient) ListResponder(resp *http.Response) (result Route
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all route tables in a subscription.
-func (client RouteTablesClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Requ
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result Ro
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListRes
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -434,16 +434,16 @@ func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result Rou
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters
 // is parameters supplied to update route table tags.
-func (client RouteTablesClient) UpdateTags(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (result RouteTablesUpdateTagsFuture, err error) {
+func (client RouteTablesGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (result RouteTablesGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, routeTableName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client RouteTablesClient) UpdateTags(ctx context.Context, resourceGroupNam
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client RouteTablesClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (*http.Request, error) {
+func (client RouteTablesGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -475,7 +475,7 @@ func (client RouteTablesClient) UpdateTagsPreparer(ctx context.Context, resource
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) UpdateTagsSender(req *http.Request) (future RouteTablesUpdateTagsFuture, err error) {
+func (client RouteTablesGroupClient) UpdateTagsSender(req *http.Request) (future RouteTablesGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client RouteTablesClient) UpdateTagsSender(req *http.Request) (future Rout
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) UpdateTagsResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) UpdateTagsResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/securitygroups.go b/services/network/mgmt/2017-10-01/network/securitygroupsgroup.go
similarity index 66%
rename from services/network/mgmt/2017-10-01/network/securitygroups.go
rename to services/network/mgmt/2017-10-01/network/securitygroupsgroup.go
index 76f193b7cec1..e0f1c951ca0c 100644
--- a/services/network/mgmt/2017-10-01/network/securitygroups.go
+++ b/services/network/mgmt/2017-10-01/network/securitygroupsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// SecurityGroupsClient is the network Client
-type SecurityGroupsClient struct {
+// SecurityGroupsGroupClient is the network Client
+type SecurityGroupsGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityGroupsClient creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
-	return NewSecurityGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityGroupsGroupClient creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClient(subscriptionID string) SecurityGroupsGroupClient {
+	return NewSecurityGroupsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityGroupsClientWithBaseURI creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
-	return SecurityGroupsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityGroupsGroupClientWithBaseURI creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsGroupClient {
+	return SecurityGroupsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network security group in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. parameters is parameters supplied to the create or update network security group operation.
-func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceG
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (futu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -114,16 +114,16 @@ func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -131,7 +131,7 @@ func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -153,7 +153,7 @@ func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) DeleteSender(req *http.Request) (future SecurityGroupsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -168,7 +168,7 @@ func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future Secur
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityGroupsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -182,30 +182,30 @@ func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. expand is expands referenced resources.
-func (client SecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -230,14 +230,14 @@ func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result Sec
 // List gets all network security groups in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client SecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -296,14 +296,14 @@ func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -315,10 +315,10 @@ func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result Se
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -326,47 +326,47 @@ func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupList
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network security groups in a subscription.
-func (client SecurityGroupsClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -386,14 +386,14 @@ func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.R
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -405,10 +405,10 @@ func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -416,17 +416,17 @@ func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupL
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -435,16 +435,16 @@ func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. parameters is parameters supplied to update network security group tags.
-func (client SecurityGroupsClient) UpdateTags(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (result SecurityGroupsUpdateTagsFuture, err error) {
+func (client SecurityGroupsGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (result SecurityGroupsGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -452,7 +452,7 @@ func (client SecurityGroupsClient) UpdateTags(ctx context.Context, resourceGroup
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client SecurityGroupsClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -476,7 +476,7 @@ func (client SecurityGroupsClient) UpdateTagsPreparer(ctx context.Context, resou
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) UpdateTagsSender(req *http.Request) (future SecurityGroupsUpdateTagsFuture, err error) {
+func (client SecurityGroupsGroupClient) UpdateTagsSender(req *http.Request) (future SecurityGroupsGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -491,7 +491,7 @@ func (client SecurityGroupsClient) UpdateTagsSender(req *http.Request) (future S
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) UpdateTagsResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) UpdateTagsResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/securityrules.go b/services/network/mgmt/2017-10-01/network/securityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-10-01/network/securityrules.go
rename to services/network/mgmt/2017-10-01/network/securityrulesgroup.go
index 80d0d5328a26..8726d2aa2f28 100644
--- a/services/network/mgmt/2017-10-01/network/securityrules.go
+++ b/services/network/mgmt/2017-10-01/network/securityrulesgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SecurityRulesClient is the network Client
-type SecurityRulesClient struct {
+// SecurityRulesGroupClient is the network Client
+type SecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityRulesClient creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
-	return NewSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityRulesGroupClient creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClient(subscriptionID string) SecurityRulesGroupClient {
+	return NewSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityRulesClientWithBaseURI creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
-	return SecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityRulesGroupClientWithBaseURI creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesGroupClient {
+	return SecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a security rule in the specified network security group.
@@ -44,16 +44,16 @@ func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) Se
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule. securityRuleParameters is parameters supplied
 // to the create or update network security rule operation.
-func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
+func (client SecurityRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -156,7 +156,7 @@ func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) DeleteSender(req *http.Request) (future SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) DeleteSender(req *http.Request) (future SecurityRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SecurityRulesClient) DeleteSender(req *http.Request) (future Securi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -231,14 +231,14 @@ func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -253,31 +253,31 @@ func (client SecurityRulesClient) GetResponder(resp *http.Response) (result Secu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client SecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -299,14 +299,14 @@ func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -318,10 +318,10 @@ func (client SecurityRulesClient) ListResponder(resp *http.Response) (result Sec
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -329,17 +329,17 @@ func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client SecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/subnets.go b/services/network/mgmt/2017-10-01/network/subnetsgroup.go
similarity index 69%
rename from services/network/mgmt/2017-10-01/network/subnets.go
rename to services/network/mgmt/2017-10-01/network/subnetsgroup.go
index 873f75a1ddad..5b206d62b6fe 100644
--- a/services/network/mgmt/2017-10-01/network/subnets.go
+++ b/services/network/mgmt/2017-10-01/network/subnetsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SubnetsClient is the network Client
-type SubnetsClient struct {
+// SubnetsGroupClient is the network Client
+type SubnetsGroupClient struct {
 	BaseClient
 }
 
-// NewSubnetsClient creates an instance of the SubnetsClient client.
-func NewSubnetsClient(subscriptionID string) SubnetsClient {
-	return NewSubnetsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSubnetsGroupClient creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClient(subscriptionID string) SubnetsGroupClient {
+	return NewSubnetsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSubnetsClientWithBaseURI creates an instance of the SubnetsClient client.
-func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
-	return SubnetsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSubnetsGroupClientWithBaseURI creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClientWithBaseURI(baseURI string, subscriptionID string) SubnetsGroupClient {
+	return SubnetsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a subnet in the specified virtual network.
@@ -44,16 +44,16 @@ func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsC
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. subnetParameters is parameters supplied to the create or update subnet
 // operation.
-func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, subnetParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupNam
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
+func (client SubnetsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -86,7 +86,7 @@ func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resource
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateSender(req *http.Request) (future SubnetsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future Subn
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet.
-func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
+func (client SubnetsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -156,7 +156,7 @@ func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupNam
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) DeleteSender(req *http.Request) (future SubnetsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDelet
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SubnetsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autores
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. expand is expands referenced resources.
-func (client SubnetsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
+func (client SubnetsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
+func (client SubnetsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -234,14 +234,14 @@ func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName s
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) GetResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -255,31 +255,31 @@ func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, er
 // List gets all subnets in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client SubnetsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
+func (client SubnetsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.slr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.slr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client SubnetsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -301,14 +301,14 @@ func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,10 +320,10 @@ func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetLis
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
 	req, err := lastResults.subnetListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -331,17 +331,17 @@ func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (resul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SubnetsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
+func (client SubnetsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/usages.go b/services/network/mgmt/2017-10-01/network/usagesgroup.go
similarity index 64%
rename from services/network/mgmt/2017-10-01/network/usages.go
rename to services/network/mgmt/2017-10-01/network/usagesgroup.go
index 99f174c14859..37153c22da77 100644
--- a/services/network/mgmt/2017-10-01/network/usages.go
+++ b/services/network/mgmt/2017-10-01/network/usagesgroup.go
@@ -25,55 +25,55 @@ import (
 	"net/http"
 )
 
-// UsagesClient is the network Client
-type UsagesClient struct {
+// UsagesGroupClient is the network Client
+type UsagesGroupClient struct {
 	BaseClient
 }
 
-// NewUsagesClient creates an instance of the UsagesClient client.
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return NewUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewUsagesGroupClient creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClient(subscriptionID string) UsagesGroupClient {
+	return NewUsagesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewUsagesClientWithBaseURI creates an instance of the UsagesClient client.
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return UsagesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewUsagesGroupClientWithBaseURI creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClientWithBaseURI(baseURI string, subscriptionID string) UsagesGroupClient {
+	return UsagesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list network usages for a subscription.
 //
 // location is the location where resource usage is queried.
-func (client UsagesClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
+func (client UsagesGroupClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: location,
 			Constraints: []validation.Constraint{{Target: "location", Name: validation.Pattern, Rule: `^[-\w\._]+$`, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.UsagesClient", "List", err.Error())
+		return result, validation.NewError("network.UsagesGroupClient", "List", err.Error())
 	}
 
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ulr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ulr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client UsagesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -94,14 +94,14 @@ func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client UsagesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client UsagesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,10 +113,10 @@ func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesList
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
 	req, err := lastResults.usagesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -124,17 +124,17 @@ func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client UsagesClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
+func (client UsagesGroupClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/version.go b/services/network/mgmt/2017-10-01/network/version.go
index d08f6b795c22..63850a4b2460 100644
--- a/services/network/mgmt/2017-10-01/network/version.go
+++ b/services/network/mgmt/2017-10-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2017-10-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2017-10-01/network/virtualnetworkgatewayconnections.go b/services/network/mgmt/2017-10-01/network/virtualnetworkgatewayconnectionsgroup.go
similarity index 71%
rename from services/network/mgmt/2017-10-01/network/virtualnetworkgatewayconnections.go
rename to services/network/mgmt/2017-10-01/network/virtualnetworkgatewayconnectionsgroup.go
index 0aaa84a7e86e..3962e72c0c92 100644
--- a/services/network/mgmt/2017-10-01/network/virtualnetworkgatewayconnections.go
+++ b/services/network/mgmt/2017-10-01/network/virtualnetworkgatewayconnectionsgroup.go
@@ -25,20 +25,21 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewayConnectionsClient is the network Client
-type VirtualNetworkGatewayConnectionsClient struct {
+// VirtualNetworkGatewayConnectionsGroupClient is the network Client
+type VirtualNetworkGatewayConnectionsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewayConnectionsClient creates an instance of the VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return NewVirtualNetworkGatewayConnectionsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewayConnectionsGroupClient creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClient(subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewayConnectionsClientWithBaseURI creates an instance of the
-// VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return VirtualNetworkGatewayConnectionsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return VirtualNetworkGatewayConnectionsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway connection in the specified resource group.
@@ -46,7 +47,7 @@ func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscr
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection. parameters is parameters supplied to the create or update virtual network
 // gateway connection operation.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat", Name: validation.Null, Rule: true,
@@ -57,18 +58,18 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 					{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2", Name: validation.Null, Rule: false,
 						Chain: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -76,7 +77,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -100,7 +101,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -115,7 +116,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *h
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -130,16 +131,16 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -147,7 +148,7 @@ func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -169,7 +170,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +185,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Requ
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -198,30 +199,30 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -243,14 +244,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Con
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -266,30 +267,30 @@ func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection shared key name.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
 	req, err := client.GetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSharedKeySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSharedKeyPreparer prepares the GetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -311,14 +312,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx co
 
 // GetSharedKeySender sends the GetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSharedKeyResponder handles the response to the GetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,31 +334,31 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp
 // created.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewayConnectionsClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vngclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vngclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -378,14 +379,14 @@ func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Co
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -397,10 +398,10 @@ func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayConnectionListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -408,17 +409,17 @@ func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -430,25 +431,25 @@ func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Co
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection reset shared key Name. parameters is parameters supplied to the begin reset virtual network
 // gateway connection shared key operation through network resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.InclusiveMaximum, Rule: 128, Chain: nil},
 					{Target: "parameters.KeyLength", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", err.Error())
 	}
 
 	req, err := client.ResetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -456,7 +457,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.
 }
 
 // ResetSharedKeyPreparer prepares the ResetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -480,7 +481,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx
 
 // ResetSharedKeySender sends the ResetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -495,7 +496,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *h
 
 // ResetSharedKeyResponder handles the response to the ResetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -513,22 +514,22 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection name. parameters is parameters supplied to the Begin Set Virtual Network Gateway connection
 // Shared key operation throughNetwork resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Value", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", err.Error())
 	}
 
 	req, err := client.SetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -536,7 +537,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Co
 }
 
 // SetSharedKeyPreparer prepares the SetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -560,7 +561,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx co
 
 // SetSharedKeySender sends the SetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -575,7 +576,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *htt
 
 // SetSharedKeyResponder handles the response to the SetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -591,16 +592,16 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection. parameters is parameters supplied to update virtual network gateway
 // connection tags.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (result VirtualNetworkGatewayConnectionsUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (result VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -608,7 +609,7 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTags(ctx context.Cont
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -632,7 +633,7 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsPreparer(ctx cont
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewayConnectionsUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -647,7 +648,7 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsSender(req *http.
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListEntity, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListEntity, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/virtualnetworkgateways.go b/services/network/mgmt/2017-10-01/network/virtualnetworkgatewaysgroup.go
similarity index 73%
rename from services/network/mgmt/2017-10-01/network/virtualnetworkgateways.go
rename to services/network/mgmt/2017-10-01/network/virtualnetworkgatewaysgroup.go
index f81dd003937d..85755d5e9ea8 100644
--- a/services/network/mgmt/2017-10-01/network/virtualnetworkgateways.go
+++ b/services/network/mgmt/2017-10-01/network/virtualnetworkgatewaysgroup.go
@@ -25,41 +25,41 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewaysClient is the network Client
-type VirtualNetworkGatewaysClient struct {
+// VirtualNetworkGatewaysGroupClient is the network Client
+type VirtualNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewaysClient creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClient(subscriptionID string) VirtualNetworkGatewaysClient {
-	return NewVirtualNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewaysGroupClient creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClient(subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return NewVirtualNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewaysClientWithBaseURI creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysClient {
-	return VirtualNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewaysGroupClientWithBaseURI creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return VirtualNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to create or update virtual network gateway operation.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -67,7 +67,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -91,7 +91,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -106,7 +106,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -121,16 +121,16 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -138,7 +138,7 @@ func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -160,7 +160,7 @@ func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -175,7 +175,7 @@ func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -191,16 +191,16 @@ func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response)
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	req, err := client.GeneratevpnclientpackagePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GeneratevpnclientpackageSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -208,7 +208,7 @@ func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.
 }
 
 // GeneratevpnclientpackagePreparer prepares the Generatevpnclientpackage request.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -232,7 +232,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx
 
 // GeneratevpnclientpackageSender sends the Generatevpnclientpackage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -247,7 +247,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *h
 
 // GeneratevpnclientpackageResponder handles the response to the Generatevpnclientpackage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -264,16 +264,16 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	req, err := client.GenerateVpnProfilePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GenerateVpnProfileSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -281,7 +281,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Contex
 }
 
 // GenerateVpnProfilePreparer prepares the GenerateVpnProfile request.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -305,7 +305,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx contex
 
 // GenerateVpnProfileSender sends the GenerateVpnProfile request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -320,7 +320,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Re
 
 // GenerateVpnProfileResponder handles the response to the GenerateVpnProfile request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -335,30 +335,30 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *htt
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -380,14 +380,14 @@ func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -403,16 +403,16 @@ func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	req, err := client.GetAdvertisedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetAdvertisedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -420,7 +420,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Conte
 }
 
 // GetAdvertisedRoutesPreparer prepares the GetAdvertisedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -443,7 +443,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx conte
 
 // GetAdvertisedRoutesSender sends the GetAdvertisedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -458,7 +458,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.R
 
 // GetAdvertisedRoutesResponder handles the response to the GetAdvertisedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -473,16 +473,16 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer to retrieve the status of.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	req, err := client.GetBgpPeerStatusPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetBgpPeerStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -490,7 +490,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context,
 }
 
 // GetBgpPeerStatusPreparer prepares the GetBgpPeerStatus request.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -515,7 +515,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.
 
 // GetBgpPeerStatusSender sends the GetBgpPeerStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -530,7 +530,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Requ
 
 // GetBgpPeerStatusResponder handles the response to the GetBgpPeerStatus request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -546,16 +546,16 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	req, err := client.GetLearnedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetLearnedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -563,7 +563,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context,
 }
 
 // GetLearnedRoutesPreparer prepares the GetLearnedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -585,7 +585,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.
 
 // GetLearnedRoutesSender sends the GetLearnedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -600,7 +600,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Requ
 
 // GetLearnedRoutesResponder handles the response to the GetLearnedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -616,16 +616,16 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURL(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURL(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture, err error) {
 	req, err := client.GetVpnProfilePackageURLPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetVpnProfilePackageURL", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetVpnProfilePackageURL", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVpnProfilePackageURLSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetVpnProfilePackageURL", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetVpnProfilePackageURL", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -633,7 +633,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURL(ctx context.C
 }
 
 // GetVpnProfilePackageURLPreparer prepares the GetVpnProfilePackageURL request.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -655,7 +655,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLPreparer(ctx c
 
 // GetVpnProfilePackageURLSender sends the GetVpnProfilePackageURL request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLSender(req *http.Request) (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -670,7 +670,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLSender(req *ht
 
 // GetVpnProfilePackageURLResponder handles the response to the GetVpnProfilePackageURL request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -684,31 +684,31 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLResponder(resp
 // List gets all virtual network gateways by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -729,14 +729,14 @@ func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -748,10 +748,10 @@ func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -759,17 +759,17 @@ func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -778,31 +778,31 @@ func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
 	result.fn = client.listConnectionsNextResults
 	req, err := client.ListConnectionsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.vnglcr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglcr, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListConnectionsPreparer prepares the ListConnections request.
-func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -824,14 +824,14 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.C
 
 // ListConnectionsSender sends the ListConnections request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListConnectionsResponder handles the response to the ListConnections request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -843,10 +843,10 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.R
 }
 
 // listConnectionsNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListConnectionsResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -854,17 +854,17 @@ func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResult
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListConnectionsComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
 	result.page, err = client.ListConnections(ctx, resourceGroupName, virtualNetworkGatewayName)
 	return
 }
@@ -874,16 +874,16 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.C
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. gatewayVip is virtual network gateway vip address supplied to the begin reset of the
 // active-active feature enabled gateway.
-func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysGroupResetFuture, err error) {
 	req, err := client.ResetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, gatewayVip)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -891,7 +891,7 @@ func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGr
 }
 
 // ResetPreparer prepares the Reset request.
-func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -916,7 +916,7 @@ func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, re
 
 // ResetSender sends the Reset request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysGroupResetFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -931,7 +931,7 @@ func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (futur
 
 // ResetResponder handles the response to the Reset request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -946,30 +946,30 @@ func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) (
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevices(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevices(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result String, err error) {
 	req, err := client.SupportedVpnDevicesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "SupportedVpnDevices", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "SupportedVpnDevices", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.SupportedVpnDevicesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "SupportedVpnDevices", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "SupportedVpnDevices", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.SupportedVpnDevicesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "SupportedVpnDevices", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "SupportedVpnDevices", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // SupportedVpnDevicesPreparer prepares the SupportedVpnDevices request.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevicesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -991,14 +991,14 @@ func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesPreparer(ctx conte
 
 // SupportedVpnDevicesSender sends the SupportedVpnDevices request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevicesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // SupportedVpnDevicesResponder handles the response to the SupportedVpnDevices request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevicesResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1013,16 +1013,16 @@ func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to update virtual network gateway tags.
-func (client VirtualNetworkGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (result VirtualNetworkGatewaysUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (result VirtualNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1030,7 +1030,7 @@ func (client VirtualNetworkGatewaysClient) UpdateTags(ctx context.Context, resou
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client VirtualNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -1054,7 +1054,7 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Contex
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewaysUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1069,7 +1069,7 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1085,30 +1085,30 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsResponder(resp *http.Respon
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection for which the configuration script is generated. parameters is parameters
 // supplied to the generate vpn device script operation.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScript(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScript(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (result String, err error) {
 	req, err := client.VpnDeviceConfigurationScriptPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "VpnDeviceConfigurationScript", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "VpnDeviceConfigurationScript", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.VpnDeviceConfigurationScriptSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "VpnDeviceConfigurationScript", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "VpnDeviceConfigurationScript", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.VpnDeviceConfigurationScriptResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "VpnDeviceConfigurationScript", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "VpnDeviceConfigurationScript", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // VpnDeviceConfigurationScriptPreparer prepares the VpnDeviceConfigurationScript request.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScriptPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -1132,14 +1132,14 @@ func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptPreparer(
 
 // VpnDeviceConfigurationScriptSender sends the VpnDeviceConfigurationScript request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScriptSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // VpnDeviceConfigurationScriptResponder handles the response to the VpnDeviceConfigurationScript request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScriptResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/virtualnetworkpeerings.go b/services/network/mgmt/2017-10-01/network/virtualnetworkpeeringsgroup.go
similarity index 70%
rename from services/network/mgmt/2017-10-01/network/virtualnetworkpeerings.go
rename to services/network/mgmt/2017-10-01/network/virtualnetworkpeeringsgroup.go
index c7a9bb2721e7..e55c6f8a3d47 100644
--- a/services/network/mgmt/2017-10-01/network/virtualnetworkpeerings.go
+++ b/services/network/mgmt/2017-10-01/network/virtualnetworkpeeringsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkPeeringsClient is the network Client
-type VirtualNetworkPeeringsClient struct {
+// VirtualNetworkPeeringsGroupClient is the network Client
+type VirtualNetworkPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkPeeringsClient creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
-	return NewVirtualNetworkPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkPeeringsGroupClient creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClient(subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return NewVirtualNetworkPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkPeeringsClientWithBaseURI creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
-	return VirtualNetworkPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkPeeringsGroupClientWithBaseURI creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return VirtualNetworkPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified virtual network.
@@ -44,16 +44,16 @@ func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID s
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the peering. virtualNetworkPeeringParameters is parameters supplied to
 // the create or update virtual network peering operation.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -86,7 +86,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -156,7 +156,7 @@ func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -231,14 +231,14 @@ func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +252,31 @@ func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (re
 // List gets all virtual network peerings in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworkPeeringsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
+func (client VirtualNetworkPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -298,14 +298,14 @@ func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +317,10 @@ func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
 	req, err := lastResults.virtualNetworkPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +328,17 @@ func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-10-01/network/virtualnetworks.go b/services/network/mgmt/2017-10-01/network/virtualnetworksgroup.go
similarity index 71%
rename from services/network/mgmt/2017-10-01/network/virtualnetworks.go
rename to services/network/mgmt/2017-10-01/network/virtualnetworksgroup.go
index 55e06c9c71d3..c962a99b843a 100644
--- a/services/network/mgmt/2017-10-01/network/virtualnetworks.go
+++ b/services/network/mgmt/2017-10-01/network/virtualnetworksgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// VirtualNetworksClient is the network Client
-type VirtualNetworksClient struct {
+// VirtualNetworksGroupClient is the network Client
+type VirtualNetworksGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworksClient creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return NewVirtualNetworksClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworksGroupClient creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClient(subscriptionID string) VirtualNetworksGroupClient {
+	return NewVirtualNetworksGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworksClientWithBaseURI creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return VirtualNetworksClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworksGroupClientWithBaseURI creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksGroupClient {
+	return VirtualNetworksGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckIPAddressAvailability checks whether a private IP address is available for use.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // IPAddress is the private IP address to be verified.
-func (client VirtualNetworksClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
 	req, err := client.CheckIPAddressAvailabilityPreparer(ctx, resourceGroupName, virtualNetworkName, IPAddress)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CheckIPAddressAvailabilitySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CheckIPAddressAvailabilityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CheckIPAddressAvailabilityPreparer prepares the CheckIPAddressAvailability request.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -91,14 +91,14 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx conte
 
 // CheckIPAddressAvailabilitySender sends the CheckIPAddressAvailability request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CheckIPAddressAvailabilityResponder handles the response to the CheckIPAddressAvailability request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // parameters is parameters supplied to the create or update virtual network operation
-func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -154,7 +154,7 @@ func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -169,7 +169,7 @@ func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -183,16 +183,16 @@ func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response)
 // Delete deletes the specified virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -200,7 +200,7 @@ func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -222,7 +222,7 @@ func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) DeleteSender(req *http.Request) (future VirtualNetworksGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -237,7 +237,7 @@ func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future Virt
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworksGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,30 +251,30 @@ func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // expand is expands referenced resources.
-func (client VirtualNetworksClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -299,14 +299,14 @@ func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,31 +320,31 @@ func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result Vi
 // List gets all virtual networks in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworksClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -365,14 +365,14 @@ func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -384,10 +384,10 @@ func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result V
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -395,47 +395,47 @@ func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all virtual networks in a subscription.
-func (client VirtualNetworksClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -455,14 +455,14 @@ func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -474,10 +474,10 @@ func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (resul
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -485,17 +485,17 @@ func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetwor
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -503,31 +503,31 @@ func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result
 // ListUsage lists usage stats.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
 	result.fn = client.listUsageNextResults
 	req, err := client.ListUsagePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.vnlur.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlur, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListUsagePreparer prepares the ListUsage request.
-func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -549,14 +549,14 @@ func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resou
 
 // ListUsageSender sends the ListUsage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListUsageSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListUsageSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListUsageResponder handles the response to the ListUsage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -568,10 +568,10 @@ func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (res
 }
 
 // listUsageNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
 	req, err := lastResults.virtualNetworkListUsageResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -579,17 +579,17 @@ func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetw
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListUsageComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
 	result.page, err = client.ListUsage(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
@@ -598,16 +598,16 @@ func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resou
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // parameters is parameters supplied to update virtual network tags.
-func (client VirtualNetworksClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (result VirtualNetworksUpdateTagsFuture, err error) {
+func (client VirtualNetworksGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (result VirtualNetworksGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -615,7 +615,7 @@ func (client VirtualNetworksClient) UpdateTags(ctx context.Context, resourceGrou
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client VirtualNetworksClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -639,7 +639,7 @@ func (client VirtualNetworksClient) UpdateTagsPreparer(ctx context.Context, reso
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) UpdateTagsSender(req *http.Request) (future VirtualNetworksUpdateTagsFuture, err error) {
+func (client VirtualNetworksGroupClient) UpdateTagsSender(req *http.Request) (future VirtualNetworksGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -654,7 +654,7 @@ func (client VirtualNetworksClient) UpdateTagsSender(req *http.Request) (future
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-10-01/network/watchers.go b/services/network/mgmt/2017-10-01/network/watchersgroup.go
similarity index 71%
rename from services/network/mgmt/2017-10-01/network/watchers.go
rename to services/network/mgmt/2017-10-01/network/watchersgroup.go
index add611b814b1..6fc261f0d44c 100644
--- a/services/network/mgmt/2017-10-01/network/watchers.go
+++ b/services/network/mgmt/2017-10-01/network/watchersgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// WatchersClient is the network Client
-type WatchersClient struct {
+// WatchersGroupClient is the network Client
+type WatchersGroupClient struct {
 	BaseClient
 }
 
-// NewWatchersClient creates an instance of the WatchersClient client.
-func NewWatchersClient(subscriptionID string) WatchersClient {
-	return NewWatchersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewWatchersGroupClient creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClient(subscriptionID string) WatchersGroupClient {
+	return NewWatchersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewWatchersClientWithBaseURI creates an instance of the WatchersClient client.
-func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) WatchersClient {
-	return WatchersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewWatchersGroupClientWithBaseURI creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClientWithBaseURI(baseURI string, subscriptionID string) WatchersGroupClient {
+	return WatchersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckConnectivity verifies the possibility of establishing a direct TCP connection from a virtual machine to a given
@@ -45,24 +45,24 @@ func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) Watcher
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that determine how the connectivity check will be performed.
-func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersGroupCheckConnectivityFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.Source.ResourceID", Name: validation.Null, Rule: true, Chain: nil}}},
 				{Target: "parameters.Destination", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "CheckConnectivity", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "CheckConnectivity", err.Error())
 	}
 
 	req, err := client.CheckConnectivityPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CheckConnectivitySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -70,7 +70,7 @@ func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGrou
 }
 
 // CheckConnectivityPreparer prepares the CheckConnectivity request.
-func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
+func (client WatchersGroupClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -94,7 +94,7 @@ func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, reso
 
 // CheckConnectivitySender sends the CheckConnectivity request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivitySender(req *http.Request) (future WatchersGroupCheckConnectivityFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -109,7 +109,7 @@ func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future
 
 // CheckConnectivityResponder handles the response to the CheckConnectivity request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
+func (client WatchersGroupClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -124,30 +124,30 @@ func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the network watcher resource.
-func (client WatchersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CreateOrUpdateSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
+func (client WatchersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -171,14 +171,14 @@ func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourc
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -192,16 +192,16 @@ func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (resul
 // Delete deletes the specified network watcher resource.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -209,7 +209,7 @@ func (client WatchersClient) Delete(ctx context.Context, resourceGroupName strin
 }
 
 // DeletePreparer prepares the Delete request.
-func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -231,7 +231,7 @@ func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupNa
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) DeleteSender(req *http.Request) (future WatchersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -246,7 +246,7 @@ func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDel
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client WatchersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -259,30 +259,30 @@ func (client WatchersClient) DeleteResponder(resp *http.Response) (result autore
 // Get gets the specified network watcher by resource group.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
+func (client WatchersGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -304,14 +304,14 @@ func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) GetResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -327,25 +327,25 @@ func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher,
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that determine Azure reachability report configuration.
-func (client WatchersClient) GetAzureReachabilityReport(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (result WatchersGetAzureReachabilityReportFuture, err error) {
+func (client WatchersGroupClient) GetAzureReachabilityReport(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (result WatchersGroupGetAzureReachabilityReportFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ProviderLocation", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.ProviderLocation.Country", Name: validation.Null, Rule: true, Chain: nil}}},
 				{Target: "parameters.StartTime", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.EndTime", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetAzureReachabilityReport", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetAzureReachabilityReport", err.Error())
 	}
 
 	req, err := client.GetAzureReachabilityReportPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetAzureReachabilityReport", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetAzureReachabilityReport", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetAzureReachabilityReportSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetAzureReachabilityReport", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetAzureReachabilityReport", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -353,7 +353,7 @@ func (client WatchersClient) GetAzureReachabilityReport(ctx context.Context, res
 }
 
 // GetAzureReachabilityReportPreparer prepares the GetAzureReachabilityReport request.
-func (client WatchersClient) GetAzureReachabilityReportPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetAzureReachabilityReportPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -377,7 +377,7 @@ func (client WatchersClient) GetAzureReachabilityReportPreparer(ctx context.Cont
 
 // GetAzureReachabilityReportSender sends the GetAzureReachabilityReport request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetAzureReachabilityReportSender(req *http.Request) (future WatchersGetAzureReachabilityReportFuture, err error) {
+func (client WatchersGroupClient) GetAzureReachabilityReportSender(req *http.Request) (future WatchersGroupGetAzureReachabilityReportFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -392,7 +392,7 @@ func (client WatchersClient) GetAzureReachabilityReportSender(req *http.Request)
 
 // GetAzureReachabilityReportResponder handles the response to the GetAzureReachabilityReport request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetAzureReachabilityReportResponder(resp *http.Response) (result AzureReachabilityReport, err error) {
+func (client WatchersGroupClient) GetAzureReachabilityReportResponder(resp *http.Response) (result AzureReachabilityReport, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -407,22 +407,22 @@ func (client WatchersClient) GetAzureReachabilityReportResponder(resp *http.Resp
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define a resource to query flow log status.
-func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGroupGetFlowLogStatusFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetFlowLogStatus", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetFlowLogStatus", err.Error())
 	}
 
 	req, err := client.GetFlowLogStatusPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetFlowLogStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -430,7 +430,7 @@ func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroup
 }
 
 // GetFlowLogStatusPreparer prepares the GetFlowLogStatus request.
-func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -454,7 +454,7 @@ func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resou
 
 // GetFlowLogStatusSender sends the GetFlowLogStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGroupGetFlowLogStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -469,7 +469,7 @@ func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future W
 
 // GetFlowLogStatusResponder handles the response to the GetFlowLogStatus request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -484,24 +484,24 @@ func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the source and destination endpoint.
-func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGroupGetNextHopFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.SourceIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.DestinationIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetNextHop", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetNextHop", err.Error())
 	}
 
 	req, err := client.GetNextHopPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetNextHopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -509,7 +509,7 @@ func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName s
 }
 
 // GetNextHopPreparer prepares the GetNextHop request.
-func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -533,7 +533,7 @@ func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGro
 
 // GetNextHopSender sends the GetNextHop request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetNextHopSender(req *http.Request) (future WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHopSender(req *http.Request) (future WatchersGroupGetNextHopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -548,7 +548,7 @@ func (client WatchersClient) GetNextHopSender(req *http.Request) (future Watcher
 
 // GetNextHopResponder handles the response to the GetNextHop request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
+func (client WatchersGroupClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -563,30 +563,30 @@ func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result Ne
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the representation of topology.
-func (client WatchersClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
 	req, err := client.GetTopologyPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetTopologySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetTopologyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetTopologyPreparer prepares the GetTopology request.
-func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -610,14 +610,14 @@ func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGr
 
 // GetTopologySender sends the GetTopology request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTopologySender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetTopologySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetTopologyResponder handles the response to the GetTopology request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -632,7 +632,7 @@ func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result T
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to troubleshoot.
-func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGroupGetTroubleshootingFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -640,18 +640,18 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 					Chain: []validation.Constraint{{Target: "parameters.TroubleshootingProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.TroubleshootingProperties.StoragePath", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshooting", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshooting", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -659,7 +659,7 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 }
 
 // GetTroubleshootingPreparer prepares the GetTroubleshooting request.
-func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -683,7 +683,7 @@ func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, res
 
 // GetTroubleshootingSender sends the GetTroubleshooting request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingSender(req *http.Request) (future WatchersGroupGetTroubleshootingFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -698,7 +698,7 @@ func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future
 
 // GetTroubleshootingResponder handles the response to the GetTroubleshooting request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -713,22 +713,22 @@ func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to query the troubleshooting result.
-func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGroupGetTroubleshootingResultFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshootingResult", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshootingResult", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingResultPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingResultSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -736,7 +736,7 @@ func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resou
 }
 
 // GetTroubleshootingResultPreparer prepares the GetTroubleshootingResult request.
-func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -760,7 +760,7 @@ func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Contex
 
 // GetTroubleshootingResultSender sends the GetTroubleshootingResult request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGroupGetTroubleshootingResultFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -775,7 +775,7 @@ func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (
 
 // GetTroubleshootingResultResponder handles the response to the GetTroubleshootingResult request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -790,22 +790,22 @@ func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the VM to check security groups for.
-func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGroupGetVMSecurityRulesFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetVMSecurityRules", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetVMSecurityRules", err.Error())
 	}
 
 	req, err := client.GetVMSecurityRulesPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVMSecurityRulesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -813,7 +813,7 @@ func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGro
 }
 
 // GetVMSecurityRulesPreparer prepares the GetVMSecurityRules request.
-func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -837,7 +837,7 @@ func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, res
 
 // GetVMSecurityRulesSender sends the GetVMSecurityRules request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGroupGetVMSecurityRulesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -852,7 +852,7 @@ func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future
 
 // GetVMSecurityRulesResponder handles the response to the GetVMSecurityRules request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -866,30 +866,30 @@ func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (r
 // List gets all network watchers by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client WatchersClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client WatchersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -910,14 +910,14 @@ func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -929,30 +929,30 @@ func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherL
 }
 
 // ListAll gets all network watchers by subscription.
-func (client WatchersClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client WatchersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -972,14 +972,14 @@ func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -994,16 +994,16 @@ func (client WatchersClient) ListAllResponder(resp *http.Response) (result Watch
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that scope the list of available providers.
-func (client WatchersClient) ListAvailableProviders(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (result WatchersListAvailableProvidersFuture, err error) {
+func (client WatchersGroupClient) ListAvailableProviders(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (result WatchersGroupListAvailableProvidersFuture, err error) {
 	req, err := client.ListAvailableProvidersPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAvailableProviders", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAvailableProviders", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListAvailableProvidersSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAvailableProviders", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAvailableProviders", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1011,7 +1011,7 @@ func (client WatchersClient) ListAvailableProviders(ctx context.Context, resourc
 }
 
 // ListAvailableProvidersPreparer prepares the ListAvailableProviders request.
-func (client WatchersClient) ListAvailableProvidersPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (*http.Request, error) {
+func (client WatchersGroupClient) ListAvailableProvidersPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1035,7 +1035,7 @@ func (client WatchersClient) ListAvailableProvidersPreparer(ctx context.Context,
 
 // ListAvailableProvidersSender sends the ListAvailableProviders request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListAvailableProvidersSender(req *http.Request) (future WatchersListAvailableProvidersFuture, err error) {
+func (client WatchersGroupClient) ListAvailableProvidersSender(req *http.Request) (future WatchersGroupListAvailableProvidersFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1050,7 +1050,7 @@ func (client WatchersClient) ListAvailableProvidersSender(req *http.Request) (fu
 
 // ListAvailableProvidersResponder handles the response to the ListAvailableProviders request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListAvailableProvidersResponder(resp *http.Response) (result AvailableProvidersList, err error) {
+func (client WatchersGroupClient) ListAvailableProvidersResponder(resp *http.Response) (result AvailableProvidersList, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1065,7 +1065,7 @@ func (client WatchersClient) ListAvailableProvidersResponder(resp *http.Response
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define the configuration of flow log.
-func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -1073,18 +1073,18 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 					Chain: []validation.Constraint{{Target: "parameters.FlowLogProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.FlowLogProperties.Enabled", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "SetFlowLogConfiguration", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "SetFlowLogConfiguration", err.Error())
 	}
 
 	req, err := client.SetFlowLogConfigurationPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetFlowLogConfigurationSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1092,7 +1092,7 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 }
 
 // SetFlowLogConfigurationPreparer prepares the SetFlowLogConfiguration request.
-func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1116,7 +1116,7 @@ func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context
 
 // SetFlowLogConfigurationSender sends the SetFlowLogConfiguration request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1131,7 +1131,7 @@ func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (f
 
 // SetFlowLogConfigurationResponder handles the response to the SetFlowLogConfiguration request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1146,30 +1146,30 @@ func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Respons
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters supplied to update network watcher tags.
-func (client WatchersClient) UpdateTags(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (result Watcher, err error) {
+func (client WatchersGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (result Watcher, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.UpdateTagsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "UpdateTags", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "UpdateTags", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "UpdateTags", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "UpdateTags", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client WatchersClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (*http.Request, error) {
+func (client WatchersGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1193,14 +1193,14 @@ func (client WatchersClient) UpdateTagsPreparer(ctx context.Context, resourceGro
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) UpdateTagsSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) UpdateTagsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) UpdateTagsResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) UpdateTagsResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1215,7 +1215,7 @@ func (client WatchersClient) UpdateTagsResponder(resp *http.Response) (result Wa
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the IP flow to be verified.
-func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersGroupVerifyIPFlowFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -1223,18 +1223,18 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 				{Target: "parameters.RemotePort", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.LocalIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.RemoteIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "VerifyIPFlow", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "VerifyIPFlow", err.Error())
 	}
 
 	req, err := client.VerifyIPFlowPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.VerifyIPFlowSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1242,7 +1242,7 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 }
 
 // VerifyIPFlowPreparer prepares the VerifyIPFlow request.
-func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
+func (client WatchersGroupClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1266,7 +1266,7 @@ func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceG
 
 // VerifyIPFlowSender sends the VerifyIPFlow request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlowSender(req *http.Request) (future WatchersGroupVerifyIPFlowFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1281,7 +1281,7 @@ func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future Watch
 
 // VerifyIPFlowResponder handles the response to the VerifyIPFlow request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
+func (client WatchersGroupClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/applicationgateways.go b/services/network/mgmt/2017-11-01/network/applicationgatewaysgroup.go
similarity index 71%
rename from services/network/mgmt/2017-11-01/network/applicationgateways.go
rename to services/network/mgmt/2017-11-01/network/applicationgatewaysgroup.go
index 772b705dc7f4..bc79ccbd6e7c 100644
--- a/services/network/mgmt/2017-11-01/network/applicationgateways.go
+++ b/services/network/mgmt/2017-11-01/network/applicationgatewaysgroup.go
@@ -25,35 +25,35 @@ import (
 	"net/http"
 )
 
-// ApplicationGatewaysClient is the network Client
-type ApplicationGatewaysClient struct {
+// ApplicationGatewaysGroupClient is the network Client
+type ApplicationGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewApplicationGatewaysClient creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
-	return NewApplicationGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewApplicationGatewaysGroupClient creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClient(subscriptionID string) ApplicationGatewaysGroupClient {
+	return NewApplicationGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewApplicationGatewaysClientWithBaseURI creates an instance of the ApplicationGatewaysClient client.
-func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
-	return ApplicationGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewApplicationGatewaysGroupClientWithBaseURI creates an instance of the ApplicationGatewaysGroupClient client.
+func NewApplicationGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysGroupClient {
+	return ApplicationGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // BackendHealth gets the backend health of the specified application gateway in a resource group.
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. expand is expands BackendAddressPool and BackendHttpSettings referenced in backend health.
-func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealth(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (result ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	req, err := client.BackendHealthPreparer(ctx, resourceGroupName, applicationGatewayName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.BackendHealthSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "BackendHealth", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "BackendHealth", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client ApplicationGatewaysClient) BackendHealth(ctx context.Context, resou
 }
 
 // BackendHealthPreparer prepares the BackendHealth request.
-func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client ApplicationGatewaysClient) BackendHealthPreparer(ctx context.Contex
 
 // BackendHealthSender sends the BackendHealth request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysBackendHealthFuture, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthSender(req *http.Request) (future ApplicationGatewaysGroupBackendHealthFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client ApplicationGatewaysClient) BackendHealthSender(req *http.Request) (
 
 // BackendHealthResponder handles the response to the BackendHealth request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
+func (client ApplicationGatewaysGroupClient) BackendHealthResponder(resp *http.Response) (result ApplicationGatewayBackendHealth, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,7 +116,7 @@ func (client ApplicationGatewaysClient) BackendHealthResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. parameters is parameters supplied to the create or update application gateway operation.
-func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (result ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ApplicationGatewayPropertiesFormat", Name: validation.Null, Rule: false,
@@ -126,18 +126,18 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 						{Target: "parameters.ApplicationGatewayPropertiesFormat.WebApplicationFirewallConfiguration.RuleSetVersion", Name: validation.Null, Rule: true, Chain: nil},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ApplicationGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ApplicationGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -145,7 +145,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdate(ctx context.Context, reso
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters ApplicationGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -169,7 +169,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdatePreparer(ctx context.Conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysCreateOrUpdateFuture, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future ApplicationGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +184,7 @@ func (client ApplicationGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -199,16 +199,16 @@ func (client ApplicationGatewaysClient) CreateOrUpdateResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -216,7 +216,7 @@ func (client ApplicationGatewaysClient) Delete(ctx context.Context, resourceGrou
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -238,7 +238,7 @@ func (client ApplicationGatewaysClient) DeletePreparer(ctx context.Context, reso
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future ApplicationGatewaysDeleteFuture, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteSender(req *http.Request) (future ApplicationGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -253,7 +253,7 @@ func (client ApplicationGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -267,30 +267,30 @@ func (client ApplicationGatewaysClient) DeleteResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -312,14 +312,14 @@ func (client ApplicationGatewaysClient) GetPreparer(ctx context.Context, resourc
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) GetResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client ApplicationGatewaysClient) GetResponder(resp *http.Response) (resul
 // GetSslPredefinedPolicy gets Ssl predefined policy with the specified policy name.
 //
 // predefinedPolicyName is name of Ssl predefined policy.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicy(ctx context.Context, predefinedPolicyName string) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	req, err := client.GetSslPredefinedPolicyPreparer(ctx, predefinedPolicyName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSslPredefinedPolicySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSslPredefinedPolicyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "GetSslPredefinedPolicy", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSslPredefinedPolicyPreparer prepares the GetSslPredefinedPolicy request.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyPreparer(ctx context.Context, predefinedPolicyName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"predefinedPolicyName": autorest.Encode("path", predefinedPolicyName),
 		"subscriptionId":       autorest.Encode("path", client.SubscriptionID),
@@ -377,14 +377,14 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyPreparer(ctx conte
 
 // GetSslPredefinedPolicySender sends the GetSslPredefinedPolicy request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSslPredefinedPolicyResponder handles the response to the GetSslPredefinedPolicy request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
+func (client ApplicationGatewaysGroupClient) GetSslPredefinedPolicyResponder(resp *http.Response) (result ApplicationGatewaySslPredefinedPolicy, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -398,31 +398,31 @@ func (client ApplicationGatewaysClient) GetSslPredefinedPolicyResponder(resp *ht
 // List lists all application gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ApplicationGatewaysClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -443,14 +443,14 @@ func (client ApplicationGatewaysClient) ListPreparer(ctx context.Context, resour
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -462,10 +462,10 @@ func (client ApplicationGatewaysClient) ListResponder(resp *http.Response) (resu
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -473,47 +473,47 @@ func (client ApplicationGatewaysClient) listNextResults(lastResults ApplicationG
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the application gateways in a subscription.
-func (client ApplicationGatewaysClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAll(ctx context.Context) (result ApplicationGatewayListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.aglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.aglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -533,14 +533,14 @@ func (client ApplicationGatewaysClient) ListAllPreparer(ctx context.Context) (*h
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllResponder(resp *http.Response) (result ApplicationGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -552,10 +552,10 @@ func (client ApplicationGatewaysClient) ListAllResponder(resp *http.Response) (r
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
+func (client ApplicationGatewaysGroupClient) listAllNextResults(lastResults ApplicationGatewayListResult) (result ApplicationGatewayListResult, err error) {
 	req, err := lastResults.applicationGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -563,46 +563,46 @@ func (client ApplicationGatewaysClient) listAllNextResults(lastResults Applicati
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAllComplete(ctx context.Context) (result ApplicationGatewayListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
 
 // ListAvailableSslOptions lists available Ssl options for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptions(ctx context.Context) (result ApplicationGatewayAvailableSslOptions, err error) {
 	req, err := client.ListAvailableSslOptionsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslOptionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableSslOptionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslOptions", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslOptions", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslOptionsPreparer prepares the ListAvailableSslOptions request.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -622,14 +622,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsPreparer(ctx cont
 
 // ListAvailableSslOptionsSender sends the ListAvailableSslOptions request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslOptionsResponder handles the response to the ListAvailableSslOptions request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslOptionsResponder(resp *http.Response) (result ApplicationGatewayAvailableSslOptions, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -641,31 +641,31 @@ func (client ApplicationGatewaysClient) ListAvailableSslOptionsResponder(resp *h
 }
 
 // ListAvailableSslPredefinedPolicies lists all SSL predefined policies for configuring Ssl policy.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPolicies(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesPage, err error) {
 	result.fn = client.listAvailableSslPredefinedPoliciesNextResults
 	req, err := client.ListAvailableSslPredefinedPoliciesPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.agaspp.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure sending request")
 		return
 	}
 
 	result.agaspp, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableSslPredefinedPolicies", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesPreparer prepares the ListAvailableSslPredefinedPolicies request.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -685,14 +685,14 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesPrepar
 
 // ListAvailableSslPredefinedPoliciesSender sends the ListAvailableSslPredefinedPolicies request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableSslPredefinedPoliciesResponder handles the response to the ListAvailableSslPredefinedPolicies request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesResponder(resp *http.Response) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -704,10 +704,10 @@ func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesRespon
 }
 
 // listAvailableSslPredefinedPoliciesNextResults retrieves the next set of results, if any.
-func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
+func (client ApplicationGatewaysGroupClient) listAvailableSslPredefinedPoliciesNextResults(lastResults ApplicationGatewayAvailableSslPredefinedPolicies) (result ApplicationGatewayAvailableSslPredefinedPolicies, err error) {
 	req, err := lastResults.applicationGatewayAvailableSslPredefinedPoliciesPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -715,46 +715,46 @@ func (client ApplicationGatewaysClient) listAvailableSslPredefinedPoliciesNextRe
 	resp, err := client.ListAvailableSslPredefinedPoliciesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAvailableSslPredefinedPoliciesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "listAvailableSslPredefinedPoliciesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAvailableSslPredefinedPoliciesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationGatewaysClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableSslPredefinedPoliciesComplete(ctx context.Context) (result ApplicationGatewayAvailableSslPredefinedPoliciesIterator, err error) {
 	result.page, err = client.ListAvailableSslPredefinedPolicies(ctx)
 	return
 }
 
 // ListAvailableWafRuleSets lists all available web application firewall rule sets.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSets(ctx context.Context) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	req, err := client.ListAvailableWafRuleSetsPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAvailableWafRuleSetsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAvailableWafRuleSetsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "ListAvailableWafRuleSets", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAvailableWafRuleSetsPreparer prepares the ListAvailableWafRuleSets request.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -774,14 +774,14 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsPreparer(ctx con
 
 // ListAvailableWafRuleSetsSender sends the ListAvailableWafRuleSets request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAvailableWafRuleSetsResponder handles the response to the ListAvailableWafRuleSets request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
+func (client ApplicationGatewaysGroupClient) ListAvailableWafRuleSetsResponder(resp *http.Response) (result ApplicationGatewayAvailableWafRuleSetsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -796,16 +796,16 @@ func (client ApplicationGatewaysClient) ListAvailableWafRuleSetsResponder(resp *
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Start(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStartFuture, err error) {
 	req, err := client.StartPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StartSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Start", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Start", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -813,7 +813,7 @@ func (client ApplicationGatewaysClient) Start(ctx context.Context, resourceGroup
 }
 
 // StartPreparer prepares the Start request.
-func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StartPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -835,7 +835,7 @@ func (client ApplicationGatewaysClient) StartPreparer(ctx context.Context, resou
 
 // StartSender sends the Start request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future ApplicationGatewaysStartFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StartSender(req *http.Request) (future ApplicationGatewaysGroupStartFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -850,7 +850,7 @@ func (client ApplicationGatewaysClient) StartSender(req *http.Request) (future A
 
 // StartResponder handles the response to the Start request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -864,16 +864,16 @@ func (client ApplicationGatewaysClient) StartResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway.
-func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) Stop(ctx context.Context, resourceGroupName string, applicationGatewayName string) (result ApplicationGatewaysGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, applicationGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -881,7 +881,7 @@ func (client ApplicationGatewaysClient) Stop(ctx context.Context, resourceGroupN
 }
 
 // StopPreparer prepares the Stop request.
-func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -903,7 +903,7 @@ func (client ApplicationGatewaysClient) StopPreparer(ctx context.Context, resour
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future ApplicationGatewaysStopFuture, err error) {
+func (client ApplicationGatewaysGroupClient) StopSender(req *http.Request) (future ApplicationGatewaysGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -918,7 +918,7 @@ func (client ApplicationGatewaysClient) StopSender(req *http.Request) (future Ap
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationGatewaysGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -932,16 +932,16 @@ func (client ApplicationGatewaysClient) StopResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. applicationGatewayName is the name of the application
 // gateway. parameters is parameters supplied to update application gateway tags.
-func (client ApplicationGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (result ApplicationGatewaysUpdateTagsFuture, err error) {
+func (client ApplicationGatewaysGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (result ApplicationGatewaysGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, applicationGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -949,7 +949,7 @@ func (client ApplicationGatewaysClient) UpdateTags(ctx context.Context, resource
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client ApplicationGatewaysClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (*http.Request, error) {
+func (client ApplicationGatewaysGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, applicationGatewayName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationGatewayName": autorest.Encode("path", applicationGatewayName),
 		"resourceGroupName":      autorest.Encode("path", resourceGroupName),
@@ -973,7 +973,7 @@ func (client ApplicationGatewaysClient) UpdateTagsPreparer(ctx context.Context,
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationGatewaysClient) UpdateTagsSender(req *http.Request) (future ApplicationGatewaysUpdateTagsFuture, err error) {
+func (client ApplicationGatewaysGroupClient) UpdateTagsSender(req *http.Request) (future ApplicationGatewaysGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -988,7 +988,7 @@ func (client ApplicationGatewaysClient) UpdateTagsSender(req *http.Request) (fut
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client ApplicationGatewaysClient) UpdateTagsResponder(resp *http.Response) (result ApplicationGateway, err error) {
+func (client ApplicationGatewaysGroupClient) UpdateTagsResponder(resp *http.Response) (result ApplicationGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/applicationsecuritygroups.go b/services/network/mgmt/2017-11-01/network/applicationsecuritygroupsgroup.go
similarity index 68%
rename from services/network/mgmt/2017-11-01/network/applicationsecuritygroups.go
rename to services/network/mgmt/2017-11-01/network/applicationsecuritygroupsgroup.go
index e62b119a651f..9ff6f00f2c35 100644
--- a/services/network/mgmt/2017-11-01/network/applicationsecuritygroups.go
+++ b/services/network/mgmt/2017-11-01/network/applicationsecuritygroupsgroup.go
@@ -24,35 +24,36 @@ import (
 	"net/http"
 )
 
-// ApplicationSecurityGroupsClient is the network Client
-type ApplicationSecurityGroupsClient struct {
+// ApplicationSecurityGroupsGroupClient is the network Client
+type ApplicationSecurityGroupsGroupClient struct {
 	BaseClient
 }
 
-// NewApplicationSecurityGroupsClient creates an instance of the ApplicationSecurityGroupsClient client.
-func NewApplicationSecurityGroupsClient(subscriptionID string) ApplicationSecurityGroupsClient {
-	return NewApplicationSecurityGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewApplicationSecurityGroupsGroupClient creates an instance of the ApplicationSecurityGroupsGroupClient client.
+func NewApplicationSecurityGroupsGroupClient(subscriptionID string) ApplicationSecurityGroupsGroupClient {
+	return NewApplicationSecurityGroupsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewApplicationSecurityGroupsClientWithBaseURI creates an instance of the ApplicationSecurityGroupsClient client.
-func NewApplicationSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsClient {
-	return ApplicationSecurityGroupsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewApplicationSecurityGroupsGroupClientWithBaseURI creates an instance of the ApplicationSecurityGroupsGroupClient
+// client.
+func NewApplicationSecurityGroupsGroupClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsGroupClient {
+	return ApplicationSecurityGroupsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an application security group.
 //
 // resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application
 // security group. parameters is parameters supplied to the create or update ApplicationSecurityGroup operation.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (result ApplicationSecurityGroupsCreateOrUpdateFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (result ApplicationSecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, applicationSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +61,7 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdate(ctx context.Context
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string, parameters ApplicationSecurityGroup) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationSecurityGroupName": autorest.Encode("path", applicationSecurityGroupName),
 		"resourceGroupName":            autorest.Encode("path", resourceGroupName),
@@ -84,7 +85,7 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdatePreparer(ctx context
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future ApplicationSecurityGroupsCreateOrUpdateFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdateSender(req *http.Request) (future ApplicationSecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +100,7 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdateSender(req *http.Req
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
+func (client ApplicationSecurityGroupsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -114,16 +115,16 @@ func (client ApplicationSecurityGroupsClient) CreateOrUpdateResponder(resp *http
 //
 // resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application
 // security group.
-func (client ApplicationSecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroupsDeleteFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) Delete(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroupsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, applicationSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -131,7 +132,7 @@ func (client ApplicationSecurityGroupsClient) Delete(ctx context.Context, resour
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ApplicationSecurityGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationSecurityGroupName": autorest.Encode("path", applicationSecurityGroupName),
 		"resourceGroupName":            autorest.Encode("path", resourceGroupName),
@@ -153,7 +154,7 @@ func (client ApplicationSecurityGroupsClient) DeletePreparer(ctx context.Context
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) DeleteSender(req *http.Request) (future ApplicationSecurityGroupsDeleteFuture, err error) {
+func (client ApplicationSecurityGroupsGroupClient) DeleteSender(req *http.Request) (future ApplicationSecurityGroupsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -168,7 +169,7 @@ func (client ApplicationSecurityGroupsClient) DeleteSender(req *http.Request) (f
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ApplicationSecurityGroupsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -182,30 +183,30 @@ func (client ApplicationSecurityGroupsClient) DeleteResponder(resp *http.Respons
 //
 // resourceGroupName is the name of the resource group. applicationSecurityGroupName is the name of the application
 // security group.
-func (client ApplicationSecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroup, err error) {
+func (client ApplicationSecurityGroupsGroupClient) Get(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (result ApplicationSecurityGroup, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, applicationSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ApplicationSecurityGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, applicationSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"applicationSecurityGroupName": autorest.Encode("path", applicationSecurityGroupName),
 		"resourceGroupName":            autorest.Encode("path", resourceGroupName),
@@ -227,14 +228,14 @@ func (client ApplicationSecurityGroupsClient) GetPreparer(ctx context.Context, r
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationSecurityGroupsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) GetResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
+func (client ApplicationSecurityGroupsGroupClient) GetResponder(resp *http.Response) (result ApplicationSecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -248,31 +249,31 @@ func (client ApplicationSecurityGroupsClient) GetResponder(resp *http.Response)
 // List gets all the application security groups in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ApplicationSecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultPage, err error) {
+func (client ApplicationSecurityGroupsGroupClient) List(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.asglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.asglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ApplicationSecurityGroupsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -293,14 +294,14 @@ func (client ApplicationSecurityGroupsClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) ListResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -312,10 +313,10 @@ func (client ApplicationSecurityGroupsClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ApplicationSecurityGroupsClient) listNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) listNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
 	req, err := lastResults.applicationSecurityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -323,47 +324,47 @@ func (client ApplicationSecurityGroupsClient) listNextResults(lastResults Applic
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationSecurityGroupsClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultIterator, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ApplicationSecurityGroupListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all application security groups in a subscription.
-func (client ApplicationSecurityGroupsClient) ListAll(ctx context.Context) (result ApplicationSecurityGroupListResultPage, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAll(ctx context.Context) (result ApplicationSecurityGroupListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.asglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.asglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ApplicationSecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -383,14 +384,14 @@ func (client ApplicationSecurityGroupsClient) ListAllPreparer(ctx context.Contex
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ApplicationSecurityGroupsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ApplicationSecurityGroupsClient) ListAllResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllResponder(resp *http.Response) (result ApplicationSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -402,10 +403,10 @@ func (client ApplicationSecurityGroupsClient) ListAllResponder(resp *http.Respon
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ApplicationSecurityGroupsClient) listAllNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
+func (client ApplicationSecurityGroupsGroupClient) listAllNextResults(lastResults ApplicationSecurityGroupListResult) (result ApplicationSecurityGroupListResult, err error) {
 	req, err := lastResults.applicationSecurityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -413,17 +414,17 @@ func (client ApplicationSecurityGroupsClient) listAllNextResults(lastResults App
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ApplicationSecurityGroupsClient) ListAllComplete(ctx context.Context) (result ApplicationSecurityGroupListResultIterator, err error) {
+func (client ApplicationSecurityGroupsGroupClient) ListAllComplete(ctx context.Context) (result ApplicationSecurityGroupListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/availableendpointservices.go b/services/network/mgmt/2017-11-01/network/availableendpointservicesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-11-01/network/availableendpointservices.go
rename to services/network/mgmt/2017-11-01/network/availableendpointservicesgroup.go
index b3b34bd416af..dadba6e1275e 100644
--- a/services/network/mgmt/2017-11-01/network/availableendpointservices.go
+++ b/services/network/mgmt/2017-11-01/network/availableendpointservicesgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// AvailableEndpointServicesClient is the network Client
-type AvailableEndpointServicesClient struct {
+// AvailableEndpointServicesGroupClient is the network Client
+type AvailableEndpointServicesGroupClient struct {
 	BaseClient
 }
 
-// NewAvailableEndpointServicesClient creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClient(subscriptionID string) AvailableEndpointServicesClient {
-	return NewAvailableEndpointServicesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewAvailableEndpointServicesGroupClient creates an instance of the AvailableEndpointServicesGroupClient client.
+func NewAvailableEndpointServicesGroupClient(subscriptionID string) AvailableEndpointServicesGroupClient {
+	return NewAvailableEndpointServicesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewAvailableEndpointServicesClientWithBaseURI creates an instance of the AvailableEndpointServicesClient client.
-func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesClient {
-	return AvailableEndpointServicesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewAvailableEndpointServicesGroupClientWithBaseURI creates an instance of the AvailableEndpointServicesGroupClient
+// client.
+func NewAvailableEndpointServicesGroupClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesGroupClient {
+	return AvailableEndpointServicesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list what values of endpoint services are available for use.
 //
 // location is the location to check available endpoint services.
-func (client AvailableEndpointServicesClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
+func (client AvailableEndpointServicesGroupClient) List(ctx context.Context, location string) (result EndpointServicesListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.eslr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.eslr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client AvailableEndpointServicesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -87,14 +88,14 @@ func (client AvailableEndpointServicesClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client AvailableEndpointServicesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client AvailableEndpointServicesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) ListResponder(resp *http.Response) (result EndpointServicesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -106,10 +107,10 @@ func (client AvailableEndpointServicesClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client AvailableEndpointServicesClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
+func (client AvailableEndpointServicesGroupClient) listNextResults(lastResults EndpointServicesListResult) (result EndpointServicesListResult, err error) {
 	req, err := lastResults.endpointServicesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -117,17 +118,17 @@ func (client AvailableEndpointServicesClient) listNextResults(lastResults Endpoi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.AvailableEndpointServicesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client AvailableEndpointServicesClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
+func (client AvailableEndpointServicesGroupClient) ListComplete(ctx context.Context, location string) (result EndpointServicesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/bgpservicecommunities.go b/services/network/mgmt/2017-11-01/network/bgpservicecommunitiesgroup.go
similarity index 63%
rename from services/network/mgmt/2017-11-01/network/bgpservicecommunities.go
rename to services/network/mgmt/2017-11-01/network/bgpservicecommunitiesgroup.go
index 19219aaa1e1a..7462502e1927 100644
--- a/services/network/mgmt/2017-11-01/network/bgpservicecommunities.go
+++ b/services/network/mgmt/2017-11-01/network/bgpservicecommunitiesgroup.go
@@ -24,47 +24,47 @@ import (
 	"net/http"
 )
 
-// BgpServiceCommunitiesClient is the network Client
-type BgpServiceCommunitiesClient struct {
+// BgpServiceCommunitiesGroupClient is the network Client
+type BgpServiceCommunitiesGroupClient struct {
 	BaseClient
 }
 
-// NewBgpServiceCommunitiesClient creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
-	return NewBgpServiceCommunitiesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewBgpServiceCommunitiesGroupClient creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClient(subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return NewBgpServiceCommunitiesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewBgpServiceCommunitiesClientWithBaseURI creates an instance of the BgpServiceCommunitiesClient client.
-func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
-	return BgpServiceCommunitiesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewBgpServiceCommunitiesGroupClientWithBaseURI creates an instance of the BgpServiceCommunitiesGroupClient client.
+func NewBgpServiceCommunitiesGroupClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesGroupClient {
+	return BgpServiceCommunitiesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available bgp service communities.
-func (client BgpServiceCommunitiesClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
+func (client BgpServiceCommunitiesGroupClient) List(ctx context.Context) (result BgpServiceCommunityListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.bsclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.bsclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client BgpServiceCommunitiesGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -84,14 +84,14 @@ func (client BgpServiceCommunitiesClient) ListPreparer(ctx context.Context) (*ht
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client BgpServiceCommunitiesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client BgpServiceCommunitiesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListResponder(resp *http.Response) (result BgpServiceCommunityListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -103,10 +103,10 @@ func (client BgpServiceCommunitiesClient) ListResponder(resp *http.Response) (re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
+func (client BgpServiceCommunitiesGroupClient) listNextResults(lastResults BgpServiceCommunityListResult) (result BgpServiceCommunityListResult, err error) {
 	req, err := lastResults.bgpServiceCommunityListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -114,17 +114,17 @@ func (client BgpServiceCommunitiesClient) listNextResults(lastResults BgpService
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.BgpServiceCommunitiesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client BgpServiceCommunitiesClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
+func (client BgpServiceCommunitiesGroupClient) ListComplete(ctx context.Context) (result BgpServiceCommunityListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/client.go b/services/network/mgmt/2017-11-01/network/client.go
index 47f1db986042..c94ce1ee38a6 100644
--- a/services/network/mgmt/2017-11-01/network/client.go
+++ b/services/network/mgmt/2017-11-01/network/client.go
@@ -21,10 +21,7 @@ package network
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 
 import (
-	"context"
 	"github.com/Azure/go-autorest/autorest"
-	"github.com/Azure/go-autorest/autorest/azure"
-	"net/http"
 )
 
 const (
@@ -52,70 +49,3 @@ func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
 		SubscriptionID: subscriptionID,
 	}
 }
-
-// CheckDNSNameAvailability checks whether a domain name in the cloudapp.azure.com zone is available for use.
-//
-// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
-// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
-func (client BaseClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
-	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
-		return
-	}
-
-	resp, err := client.CheckDNSNameAvailabilitySender(req)
-	if err != nil {
-		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure sending request")
-		return
-	}
-
-	result, err = client.CheckDNSNameAvailabilityResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.BaseClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
-	}
-
-	return
-}
-
-// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
-func (client BaseClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
-	pathParameters := map[string]interface{}{
-		"location":       autorest.Encode("path", location),
-		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
-	}
-
-	const APIVersion = "2017-11-01"
-	queryParameters := map[string]interface{}{
-		"api-version":     APIVersion,
-		"domainNameLabel": autorest.Encode("query", domainNameLabel),
-	}
-
-	preparer := autorest.CreatePreparer(
-		autorest.AsGet(),
-		autorest.WithBaseURL(client.BaseURI),
-		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
-		autorest.WithQueryParameters(queryParameters))
-	return preparer.Prepare((&http.Request{}).WithContext(ctx))
-}
-
-// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
-// http.Response Body if it receives an error.
-func (client BaseClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
-	return autorest.SendWithSender(client, req,
-		azure.DoRetryWithRegistration(client.Client))
-}
-
-// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
-// closes the http.Response Body.
-func (client BaseClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
-	err = autorest.Respond(
-		resp,
-		client.ByInspecting(),
-		azure.WithErrorUnlessStatusCode(http.StatusOK),
-		autorest.ByUnmarshallingJSON(&result),
-		autorest.ByClosing())
-	result.Response = autorest.Response{Response: resp}
-	return
-}
diff --git a/services/network/mgmt/2017-11-01/network/connectionmonitors.go b/services/network/mgmt/2017-11-01/network/connectionmonitorsgroup.go
similarity index 74%
rename from services/network/mgmt/2017-11-01/network/connectionmonitors.go
rename to services/network/mgmt/2017-11-01/network/connectionmonitorsgroup.go
index 231dd551e27a..0d28df11538d 100644
--- a/services/network/mgmt/2017-11-01/network/connectionmonitors.go
+++ b/services/network/mgmt/2017-11-01/network/connectionmonitorsgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// ConnectionMonitorsClient is the network Client
-type ConnectionMonitorsClient struct {
+// ConnectionMonitorsGroupClient is the network Client
+type ConnectionMonitorsGroupClient struct {
 	BaseClient
 }
 
-// NewConnectionMonitorsClient creates an instance of the ConnectionMonitorsClient client.
-func NewConnectionMonitorsClient(subscriptionID string) ConnectionMonitorsClient {
-	return NewConnectionMonitorsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewConnectionMonitorsGroupClient creates an instance of the ConnectionMonitorsGroupClient client.
+func NewConnectionMonitorsGroupClient(subscriptionID string) ConnectionMonitorsGroupClient {
+	return NewConnectionMonitorsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewConnectionMonitorsClientWithBaseURI creates an instance of the ConnectionMonitorsClient client.
-func NewConnectionMonitorsClientWithBaseURI(baseURI string, subscriptionID string) ConnectionMonitorsClient {
-	return ConnectionMonitorsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewConnectionMonitorsGroupClientWithBaseURI creates an instance of the ConnectionMonitorsGroupClient client.
+func NewConnectionMonitorsGroupClientWithBaseURI(baseURI string, subscriptionID string) ConnectionMonitorsGroupClient {
+	return ConnectionMonitorsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate create or update a connection monitor.
@@ -45,7 +45,7 @@ func NewConnectionMonitorsClientWithBaseURI(baseURI string, subscriptionID strin
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor. parameters is
 // parameters that define the operation to create a connection monitor.
-func (client ConnectionMonitorsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string, parameters ConnectionMonitor) (result ConnectionMonitorsCreateOrUpdateFuture, err error) {
+func (client ConnectionMonitorsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string, parameters ConnectionMonitor) (result ConnectionMonitorsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ConnectionMonitorParameters", Name: validation.Null, Rule: true,
@@ -53,18 +53,18 @@ func (client ConnectionMonitorsClient) CreateOrUpdate(ctx context.Context, resou
 					Chain: []validation.Constraint{{Target: "parameters.ConnectionMonitorParameters.Source.ResourceID", Name: validation.Null, Rule: true, Chain: nil}}},
 					{Target: "parameters.ConnectionMonitorParameters.Destination", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ConnectionMonitorsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ConnectionMonitorsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -72,7 +72,7 @@ func (client ConnectionMonitorsClient) CreateOrUpdate(ctx context.Context, resou
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ConnectionMonitorsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string, parameters ConnectionMonitor) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string, parameters ConnectionMonitor) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -97,7 +97,7 @@ func (client ConnectionMonitorsClient) CreateOrUpdatePreparer(ctx context.Contex
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) CreateOrUpdateSender(req *http.Request) (future ConnectionMonitorsCreateOrUpdateFuture, err error) {
+func (client ConnectionMonitorsGroupClient) CreateOrUpdateSender(req *http.Request) (future ConnectionMonitorsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -112,7 +112,7 @@ func (client ConnectionMonitorsClient) CreateOrUpdateSender(req *http.Request) (
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) CreateOrUpdateResponder(resp *http.Response) (result ConnectionMonitorResult, err error) {
+func (client ConnectionMonitorsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ConnectionMonitorResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -127,16 +127,16 @@ func (client ConnectionMonitorsClient) CreateOrUpdateResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor.
-func (client ConnectionMonitorsClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsDeleteFuture, err error) {
+func (client ConnectionMonitorsGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -144,7 +144,7 @@ func (client ConnectionMonitorsClient) Delete(ctx context.Context, resourceGroup
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ConnectionMonitorsClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -167,7 +167,7 @@ func (client ConnectionMonitorsClient) DeletePreparer(ctx context.Context, resou
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) DeleteSender(req *http.Request) (future ConnectionMonitorsDeleteFuture, err error) {
+func (client ConnectionMonitorsGroupClient) DeleteSender(req *http.Request) (future ConnectionMonitorsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -182,7 +182,7 @@ func (client ConnectionMonitorsClient) DeleteSender(req *http.Request) (future C
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ConnectionMonitorsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -196,30 +196,30 @@ func (client ConnectionMonitorsClient) DeleteResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor.
-func (client ConnectionMonitorsClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorResult, err error) {
+func (client ConnectionMonitorsGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorResult, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ConnectionMonitorsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -242,14 +242,14 @@ func (client ConnectionMonitorsClient) GetPreparer(ctx context.Context, resource
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ConnectionMonitorsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) GetResponder(resp *http.Response) (result ConnectionMonitorResult, err error) {
+func (client ConnectionMonitorsGroupClient) GetResponder(resp *http.Response) (result ConnectionMonitorResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -264,30 +264,30 @@ func (client ConnectionMonitorsClient) GetResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource.
-func (client ConnectionMonitorsClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result ConnectionMonitorListResult, err error) {
+func (client ConnectionMonitorsGroupClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result ConnectionMonitorListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ConnectionMonitorsClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -309,14 +309,14 @@ func (client ConnectionMonitorsClient) ListPreparer(ctx context.Context, resourc
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ConnectionMonitorsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) ListResponder(resp *http.Response) (result ConnectionMonitorListResult, err error) {
+func (client ConnectionMonitorsGroupClient) ListResponder(resp *http.Response) (result ConnectionMonitorListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -331,16 +331,16 @@ func (client ConnectionMonitorsClient) ListResponder(resp *http.Response) (resul
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name given to the connection monitor.
-func (client ConnectionMonitorsClient) Query(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsQueryFuture, err error) {
+func (client ConnectionMonitorsGroupClient) Query(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsGroupQueryFuture, err error) {
 	req, err := client.QueryPreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Query", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Query", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.QuerySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Query", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Query", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -348,7 +348,7 @@ func (client ConnectionMonitorsClient) Query(ctx context.Context, resourceGroupN
 }
 
 // QueryPreparer prepares the Query request.
-func (client ConnectionMonitorsClient) QueryPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) QueryPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -371,7 +371,7 @@ func (client ConnectionMonitorsClient) QueryPreparer(ctx context.Context, resour
 
 // QuerySender sends the Query request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) QuerySender(req *http.Request) (future ConnectionMonitorsQueryFuture, err error) {
+func (client ConnectionMonitorsGroupClient) QuerySender(req *http.Request) (future ConnectionMonitorsGroupQueryFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -386,7 +386,7 @@ func (client ConnectionMonitorsClient) QuerySender(req *http.Request) (future Co
 
 // QueryResponder handles the response to the Query request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) QueryResponder(resp *http.Response) (result ConnectionMonitorQueryResult, err error) {
+func (client ConnectionMonitorsGroupClient) QueryResponder(resp *http.Response) (result ConnectionMonitorQueryResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -401,16 +401,16 @@ func (client ConnectionMonitorsClient) QueryResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor.
-func (client ConnectionMonitorsClient) Start(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsStartFuture, err error) {
+func (client ConnectionMonitorsGroupClient) Start(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsGroupStartFuture, err error) {
 	req, err := client.StartPreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Start", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Start", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StartSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Start", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Start", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -418,7 +418,7 @@ func (client ConnectionMonitorsClient) Start(ctx context.Context, resourceGroupN
 }
 
 // StartPreparer prepares the Start request.
-func (client ConnectionMonitorsClient) StartPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) StartPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -441,7 +441,7 @@ func (client ConnectionMonitorsClient) StartPreparer(ctx context.Context, resour
 
 // StartSender sends the Start request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) StartSender(req *http.Request) (future ConnectionMonitorsStartFuture, err error) {
+func (client ConnectionMonitorsGroupClient) StartSender(req *http.Request) (future ConnectionMonitorsGroupStartFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -456,7 +456,7 @@ func (client ConnectionMonitorsClient) StartSender(req *http.Request) (future Co
 
 // StartResponder handles the response to the Start request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ConnectionMonitorsGroupClient) StartResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -470,16 +470,16 @@ func (client ConnectionMonitorsClient) StartResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group containing Network Watcher. networkWatcherName is the name
 // of the Network Watcher resource. connectionMonitorName is the name of the connection monitor.
-func (client ConnectionMonitorsClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsStopFuture, err error) {
+func (client ConnectionMonitorsGroupClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (result ConnectionMonitorsGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, networkWatcherName, connectionMonitorName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -487,7 +487,7 @@ func (client ConnectionMonitorsClient) Stop(ctx context.Context, resourceGroupNa
 }
 
 // StopPreparer prepares the Stop request.
-func (client ConnectionMonitorsClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
+func (client ConnectionMonitorsGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, connectionMonitorName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"connectionMonitorName": autorest.Encode("path", connectionMonitorName),
 		"networkWatcherName":    autorest.Encode("path", networkWatcherName),
@@ -510,7 +510,7 @@ func (client ConnectionMonitorsClient) StopPreparer(ctx context.Context, resourc
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client ConnectionMonitorsClient) StopSender(req *http.Request) (future ConnectionMonitorsStopFuture, err error) {
+func (client ConnectionMonitorsGroupClient) StopSender(req *http.Request) (future ConnectionMonitorsGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -525,7 +525,7 @@ func (client ConnectionMonitorsClient) StopSender(req *http.Request) (future Con
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client ConnectionMonitorsClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ConnectionMonitorsGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/defaultsecurityrules.go b/services/network/mgmt/2017-11-01/network/defaultsecurityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-11-01/network/defaultsecurityrules.go
rename to services/network/mgmt/2017-11-01/network/defaultsecurityrulesgroup.go
index a263ea416d2c..585e3cb5e0b6 100644
--- a/services/network/mgmt/2017-11-01/network/defaultsecurityrules.go
+++ b/services/network/mgmt/2017-11-01/network/defaultsecurityrulesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// DefaultSecurityRulesClient is the network Client
-type DefaultSecurityRulesClient struct {
+// DefaultSecurityRulesGroupClient is the network Client
+type DefaultSecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewDefaultSecurityRulesClient creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClient(subscriptionID string) DefaultSecurityRulesClient {
-	return NewDefaultSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewDefaultSecurityRulesGroupClient creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClient(subscriptionID string) DefaultSecurityRulesGroupClient {
+	return NewDefaultSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewDefaultSecurityRulesClientWithBaseURI creates an instance of the DefaultSecurityRulesClient client.
-func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesClient {
-	return DefaultSecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewDefaultSecurityRulesGroupClientWithBaseURI creates an instance of the DefaultSecurityRulesGroupClient client.
+func NewDefaultSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesGroupClient {
+	return DefaultSecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get get the specified default network security rule.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. defaultSecurityRuleName is the name of the default security rule.
-func (client DefaultSecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, defaultSecurityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, defaultSecurityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"defaultSecurityRuleName":  autorest.Encode("path", defaultSecurityRuleName),
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
@@ -89,14 +89,14 @@ func (client DefaultSecurityRulesClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client DefaultSecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +111,31 @@ func (client DefaultSecurityRulesClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client DefaultSecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client DefaultSecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client DefaultSecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -157,14 +157,14 @@ func (client DefaultSecurityRulesClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client DefaultSecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client DefaultSecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +176,10 @@ func (client DefaultSecurityRulesClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client DefaultSecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +187,17 @@ func (client DefaultSecurityRulesClient) listNextResults(lastResults SecurityRul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.DefaultSecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client DefaultSecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client DefaultSecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/expressroutecircuitauthorizations.go b/services/network/mgmt/2017-11-01/network/expressroutecircuitauthorizationsgroup.go
similarity index 67%
rename from services/network/mgmt/2017-11-01/network/expressroutecircuitauthorizations.go
rename to services/network/mgmt/2017-11-01/network/expressroutecircuitauthorizationsgroup.go
index a6e7641664b2..41b639497449 100644
--- a/services/network/mgmt/2017-11-01/network/expressroutecircuitauthorizations.go
+++ b/services/network/mgmt/2017-11-01/network/expressroutecircuitauthorizationsgroup.go
@@ -24,21 +24,21 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitAuthorizationsClient is the network Client
-type ExpressRouteCircuitAuthorizationsClient struct {
+// ExpressRouteCircuitAuthorizationsGroupClient is the network Client
+type ExpressRouteCircuitAuthorizationsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitAuthorizationsClient creates an instance of the ExpressRouteCircuitAuthorizationsClient
-// client.
-func NewExpressRouteCircuitAuthorizationsClient(subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return NewExpressRouteCircuitAuthorizationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitAuthorizationsGroupClient creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClient(subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitAuthorizationsClientWithBaseURI creates an instance of the
-// ExpressRouteCircuitAuthorizationsClient client.
-func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return ExpressRouteCircuitAuthorizationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitAuthorizationsGroupClient client.
+func NewExpressRouteCircuitAuthorizationsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsGroupClient {
+	return ExpressRouteCircuitAuthorizationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an authorization in the specified express route circuit.
@@ -46,16 +46,16 @@ func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subsc
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization. authorizationParameters is parameters supplied to the create
 // or update express route circuit authorization operation.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (result ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, authorizationName, authorizationParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -63,7 +63,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdate(ctx context
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string, authorizationParameters ExpressRouteCircuitAuthorization) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -88,7 +88,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -103,7 +103,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateSender(req *
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -118,16 +118,16 @@ func (client ExpressRouteCircuitAuthorizationsClient) CreateOrUpdateResponder(re
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -135,7 +135,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) Delete(ctx context.Context
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -158,7 +158,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeletePreparer(ctx context
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsDeleteFuture, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -173,7 +173,7 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteSender(req *http.Req
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -187,30 +187,30 @@ func (client ExpressRouteCircuitAuthorizationsClient) DeleteResponder(resp *http
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // authorizationName is the name of the authorization.
-func (client ExpressRouteCircuitAuthorizationsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (result ExpressRouteCircuitAuthorization, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, authorizationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, authorizationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"authorizationName": autorest.Encode("path", authorizationName),
 		"circuitName":       autorest.Encode("path", circuitName),
@@ -233,14 +233,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetPreparer(ctx context.Co
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitAuthorization, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -254,31 +254,31 @@ func (client ExpressRouteCircuitAuthorizationsClient) GetResponder(resp *http.Re
 // List gets all authorizations in an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit.
-func (client ExpressRouteCircuitAuthorizationsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.alr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.alr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -300,14 +300,14 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListPreparer(ctx context.C
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitAuthorizationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListResponder(resp *http.Response) (result AuthorizationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -319,10 +319,10 @@ func (client ExpressRouteCircuitAuthorizationsClient) ListResponder(resp *http.R
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) listNextResults(lastResults AuthorizationListResult) (result AuthorizationListResult, err error) {
 	req, err := lastResults.authorizationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -330,17 +330,17 @@ func (client ExpressRouteCircuitAuthorizationsClient) listNextResults(lastResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitAuthorizationsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
+func (client ExpressRouteCircuitAuthorizationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result AuthorizationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/expressroutecircuitpeerings.go b/services/network/mgmt/2017-11-01/network/expressroutecircuitpeeringsgroup.go
similarity index 70%
rename from services/network/mgmt/2017-11-01/network/expressroutecircuitpeerings.go
rename to services/network/mgmt/2017-11-01/network/expressroutecircuitpeeringsgroup.go
index 623624d571e5..cbef51e3fecf 100644
--- a/services/network/mgmt/2017-11-01/network/expressroutecircuitpeerings.go
+++ b/services/network/mgmt/2017-11-01/network/expressroutecircuitpeeringsgroup.go
@@ -25,19 +25,20 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitPeeringsClient is the network Client
-type ExpressRouteCircuitPeeringsClient struct {
+// ExpressRouteCircuitPeeringsGroupClient is the network Client
+type ExpressRouteCircuitPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitPeeringsClient creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return NewExpressRouteCircuitPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitPeeringsGroupClient creates an instance of the ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClient(subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitPeeringsClientWithBaseURI creates an instance of the ExpressRouteCircuitPeeringsClient client.
-func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return ExpressRouteCircuitPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitPeeringsGroupClientWithBaseURI creates an instance of the
+// ExpressRouteCircuitPeeringsGroupClient client.
+func NewExpressRouteCircuitPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsGroupClient {
+	return ExpressRouteCircuitPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified express route circuits.
@@ -45,7 +46,7 @@ func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptio
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. peeringParameters is parameters supplied to the create or update express
 // route circuit peering operation.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (result ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: peeringParameters,
 			Constraints: []validation.Constraint{{Target: "peeringParameters.ExpressRouteCircuitPeeringPropertiesFormat", Name: validation.Null, Rule: false,
@@ -54,18 +55,18 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Conte
 						{Target: "peeringParameters.ExpressRouteCircuitPeeringPropertiesFormat.PeerASN", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, peeringName, peeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -73,7 +74,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdate(ctx context.Conte
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, peeringParameters ExpressRouteCircuitPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -98,7 +99,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdatePreparer(ctx conte
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -113,7 +114,7 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateSender(req *http.R
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -128,16 +129,16 @@ func (client ExpressRouteCircuitPeeringsClient) CreateOrUpdateResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -145,7 +146,7 @@ func (client ExpressRouteCircuitPeeringsClient) Delete(ctx context.Context, reso
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -168,7 +169,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeletePreparer(ctx context.Conte
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsDeleteFuture, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -183,7 +184,7 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteSender(req *http.Request)
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -197,30 +198,30 @@ func (client ExpressRouteCircuitPeeringsClient) DeleteResponder(resp *http.Respo
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitPeeringsClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -243,14 +244,14 @@ func (client ExpressRouteCircuitPeeringsClient) GetPreparer(ctx context.Context,
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuitPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -264,31 +265,31 @@ func (client ExpressRouteCircuitPeeringsClient) GetResponder(resp *http.Response
 // List gets all peerings in a specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitPeeringsClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ercplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ercplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -310,14 +311,14 @@ func (client ExpressRouteCircuitPeeringsClient) ListPreparer(ctx context.Context
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -329,10 +330,10 @@ func (client ExpressRouteCircuitPeeringsClient) ListResponder(resp *http.Respons
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) listNextResults(lastResults ExpressRouteCircuitPeeringListResult) (result ExpressRouteCircuitPeeringListResult, err error) {
 	req, err := lastResults.expressRouteCircuitPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -340,17 +341,17 @@ func (client ExpressRouteCircuitPeeringsClient) listNextResults(lastResults Expr
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
+func (client ExpressRouteCircuitPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, circuitName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/expressroutecircuits.go b/services/network/mgmt/2017-11-01/network/expressroutecircuitsgroup.go
similarity index 72%
rename from services/network/mgmt/2017-11-01/network/expressroutecircuits.go
rename to services/network/mgmt/2017-11-01/network/expressroutecircuitsgroup.go
index 8c99f534c654..696dc506694c 100644
--- a/services/network/mgmt/2017-11-01/network/expressroutecircuits.go
+++ b/services/network/mgmt/2017-11-01/network/expressroutecircuitsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// ExpressRouteCircuitsClient is the network Client
-type ExpressRouteCircuitsClient struct {
+// ExpressRouteCircuitsGroupClient is the network Client
+type ExpressRouteCircuitsGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteCircuitsClient creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
-	return NewExpressRouteCircuitsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteCircuitsGroupClient creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClient(subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return NewExpressRouteCircuitsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteCircuitsClientWithBaseURI creates an instance of the ExpressRouteCircuitsClient client.
-func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
-	return ExpressRouteCircuitsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteCircuitsGroupClientWithBaseURI creates an instance of the ExpressRouteCircuitsGroupClient client.
+func NewExpressRouteCircuitsGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsGroupClient {
+	return ExpressRouteCircuitsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates an express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is
 // parameters supplied to the create or update express route circuit operation.
-func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (result ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, circuitName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters ExpressRouteCircuit) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsCreateOrUpdateFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateSender(req *http.Request) (future ExpressRouteCircuitsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client ExpressRouteCircuitsClient) CreateOrUpdateResponder(resp *http.Resp
 // Delete deletes the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) Delete(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client ExpressRouteCircuitsClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client ExpressRouteCircuitsClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsDeleteFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteSender(req *http.Request) (future ExpressRouteCircuitsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client ExpressRouteCircuitsClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client ExpressRouteCircuitsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -180,30 +180,30 @@ func (client ExpressRouteCircuitsClient) DeleteResponder(resp *http.Response) (r
 // Get gets information about the specified express route circuit.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of express route circuit.
-func (client ExpressRouteCircuitsClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) Get(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuit, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -225,14 +225,14 @@ func (client ExpressRouteCircuitsClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -247,30 +247,30 @@ func (client ExpressRouteCircuitsClient) GetResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering.
-func (client ExpressRouteCircuitsClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStats(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetPeeringStatsPreparer(ctx, resourceGroupName, circuitName, peeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetPeeringStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetPeeringStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetPeeringStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetPeeringStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPeeringStatsPreparer prepares the GetPeeringStats request.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"peeringName":       autorest.Encode("path", peeringName),
@@ -293,14 +293,14 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsPreparer(ctx context.Con
 
 // GetPeeringStatsSender sends the GetPeeringStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetPeeringStatsResponder handles the response to the GetPeeringStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetPeeringStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,30 +314,30 @@ func (client ExpressRouteCircuitsClient) GetPeeringStatsResponder(resp *http.Res
 // GetStats gets all the stats from an express route circuit in a resource group.
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
-func (client ExpressRouteCircuitsClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStats(ctx context.Context, resourceGroupName string, circuitName string) (result ExpressRouteCircuitStats, err error) {
 	req, err := client.GetStatsPreparer(ctx, resourceGroupName, circuitName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetStatsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetStatsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "GetStats", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "GetStats", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetStatsPreparer prepares the GetStats request.
-func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsPreparer(ctx context.Context, resourceGroupName string, circuitName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -359,14 +359,14 @@ func (client ExpressRouteCircuitsClient) GetStatsPreparer(ctx context.Context, r
 
 // GetStatsSender sends the GetStats request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) GetStatsSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetStatsResponder handles the response to the GetStats request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
+func (client ExpressRouteCircuitsGroupClient) GetStatsResponder(resp *http.Response) (result ExpressRouteCircuitStats, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -380,31 +380,31 @@ func (client ExpressRouteCircuitsClient) GetStatsResponder(resp *http.Response)
 // List gets all the express route circuits in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client ExpressRouteCircuitsClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) List(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -425,14 +425,14 @@ func (client ExpressRouteCircuitsClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -444,10 +444,10 @@ func (client ExpressRouteCircuitsClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -455,47 +455,47 @@ func (client ExpressRouteCircuitsClient) listNextResults(lastResults ExpressRout
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the express route circuits in a subscription.
-func (client ExpressRouteCircuitsClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAll(ctx context.Context) (result ExpressRouteCircuitListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.erclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.erclr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -515,14 +515,14 @@ func (client ExpressRouteCircuitsClient) ListAllPreparer(ctx context.Context) (*
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllResponder(resp *http.Response) (result ExpressRouteCircuitListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -534,10 +534,10 @@ func (client ExpressRouteCircuitsClient) ListAllResponder(resp *http.Response) (
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) listAllNextResults(lastResults ExpressRouteCircuitListResult) (result ExpressRouteCircuitListResult, err error) {
 	req, err := lastResults.expressRouteCircuitListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -545,17 +545,17 @@ func (client ExpressRouteCircuitsClient) listAllNextResults(lastResults ExpressR
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListAllComplete(ctx context.Context) (result ExpressRouteCircuitListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -564,16 +564,16 @@ func (client ExpressRouteCircuitsClient) ListAllComplete(ctx context.Context) (r
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	req, err := client.ListArpTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListArpTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListArpTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListArpTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -581,7 +581,7 @@ func (client ExpressRouteCircuitsClient) ListArpTable(ctx context.Context, resou
 }
 
 // ListArpTablePreparer prepares the ListArpTable request.
-func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -605,7 +605,7 @@ func (client ExpressRouteCircuitsClient) ListArpTablePreparer(ctx context.Contex
 
 // ListArpTableSender sends the ListArpTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsListArpTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListArpTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -620,7 +620,7 @@ func (client ExpressRouteCircuitsClient) ListArpTableSender(req *http.Request) (
 
 // ListArpTableResponder handles the response to the ListArpTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListArpTableResponder(resp *http.Response) (result ExpressRouteCircuitsArpTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -636,16 +636,16 @@ func (client ExpressRouteCircuitsClient) ListArpTableResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTable(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	req, err := client.ListRoutesTablePreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -653,7 +653,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTable(ctx context.Context, re
 }
 
 // ListRoutesTablePreparer prepares the ListRoutesTable request.
-func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTablePreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -677,7 +677,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTablePreparer(ctx context.Con
 
 // ListRoutesTableSender sends the ListRoutesTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -692,7 +692,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSender(req *http.Request
 
 // ListRoutesTableResponder handles the response to the ListRoutesTable request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -708,16 +708,16 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the express route circuit.
 // peeringName is the name of the peering. devicePath is the path of the device.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummary(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (result ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	req, err := client.ListRoutesTableSummaryPreparer(ctx, resourceGroupName, circuitName, peeringName, devicePath)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListRoutesTableSummarySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "ListRoutesTableSummary", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -725,7 +725,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummary(ctx context.Cont
 }
 
 // ListRoutesTableSummaryPreparer prepares the ListRoutesTableSummary request.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryPreparer(ctx context.Context, resourceGroupName string, circuitName string, peeringName string, devicePath string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"devicePath":        autorest.Encode("path", devicePath),
@@ -749,7 +749,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryPreparer(ctx cont
 
 // ListRoutesTableSummarySender sends the ListRoutesTableSummary request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsListRoutesTableSummaryFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummarySender(req *http.Request) (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -764,7 +764,7 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummarySender(req *http.
 
 // ListRoutesTableSummaryResponder handles the response to the ListRoutesTableSummary request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (client ExpressRouteCircuitsGroupClient) ListRoutesTableSummaryResponder(resp *http.Response) (result ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -779,16 +779,16 @@ func (client ExpressRouteCircuitsClient) ListRoutesTableSummaryResponder(resp *h
 //
 // resourceGroupName is the name of the resource group. circuitName is the name of the circuit. parameters is
 // parameters supplied to update express route circuit tags.
-func (client ExpressRouteCircuitsClient) UpdateTags(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (result ExpressRouteCircuitsUpdateTagsFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (result ExpressRouteCircuitsGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, circuitName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -796,7 +796,7 @@ func (client ExpressRouteCircuitsClient) UpdateTags(ctx context.Context, resourc
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client ExpressRouteCircuitsClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (*http.Request, error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, circuitName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"circuitName":       autorest.Encode("path", circuitName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -820,7 +820,7 @@ func (client ExpressRouteCircuitsClient) UpdateTagsPreparer(ctx context.Context,
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteCircuitsClient) UpdateTagsSender(req *http.Request) (future ExpressRouteCircuitsUpdateTagsFuture, err error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTagsSender(req *http.Request) (future ExpressRouteCircuitsGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -835,7 +835,7 @@ func (client ExpressRouteCircuitsClient) UpdateTagsSender(req *http.Request) (fu
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteCircuitsClient) UpdateTagsResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
+func (client ExpressRouteCircuitsGroupClient) UpdateTagsResponder(resp *http.Response) (result ExpressRouteCircuit, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/expressrouteserviceproviders.go b/services/network/mgmt/2017-11-01/network/expressrouteserviceprovidersgroup.go
similarity index 61%
rename from services/network/mgmt/2017-11-01/network/expressrouteserviceproviders.go
rename to services/network/mgmt/2017-11-01/network/expressrouteserviceprovidersgroup.go
index 81b3c3465070..22f393be9b32 100644
--- a/services/network/mgmt/2017-11-01/network/expressrouteserviceproviders.go
+++ b/services/network/mgmt/2017-11-01/network/expressrouteserviceprovidersgroup.go
@@ -24,48 +24,49 @@ import (
 	"net/http"
 )
 
-// ExpressRouteServiceProvidersClient is the network Client
-type ExpressRouteServiceProvidersClient struct {
+// ExpressRouteServiceProvidersGroupClient is the network Client
+type ExpressRouteServiceProvidersGroupClient struct {
 	BaseClient
 }
 
-// NewExpressRouteServiceProvidersClient creates an instance of the ExpressRouteServiceProvidersClient client.
-func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
-	return NewExpressRouteServiceProvidersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewExpressRouteServiceProvidersGroupClient creates an instance of the ExpressRouteServiceProvidersGroupClient
+// client.
+func NewExpressRouteServiceProvidersGroupClient(subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return NewExpressRouteServiceProvidersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewExpressRouteServiceProvidersClientWithBaseURI creates an instance of the ExpressRouteServiceProvidersClient
-// client.
-func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
-	return ExpressRouteServiceProvidersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewExpressRouteServiceProvidersGroupClientWithBaseURI creates an instance of the
+// ExpressRouteServiceProvidersGroupClient client.
+func NewExpressRouteServiceProvidersGroupClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersGroupClient {
+	return ExpressRouteServiceProvidersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets all the available express route service providers.
-func (client ExpressRouteServiceProvidersClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) List(ctx context.Context) (result ExpressRouteServiceProviderListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ersplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ersplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -85,14 +86,14 @@ func (client ExpressRouteServiceProvidersClient) ListPreparer(ctx context.Contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client ExpressRouteServiceProvidersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListResponder(resp *http.Response) (result ExpressRouteServiceProviderListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -104,10 +105,10 @@ func (client ExpressRouteServiceProvidersClient) ListResponder(resp *http.Respon
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) listNextResults(lastResults ExpressRouteServiceProviderListResult) (result ExpressRouteServiceProviderListResult, err error) {
 	req, err := lastResults.expressRouteServiceProviderListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -115,17 +116,17 @@ func (client ExpressRouteServiceProvidersClient) listNextResults(lastResults Exp
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteServiceProvidersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client ExpressRouteServiceProvidersClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
+func (client ExpressRouteServiceProvidersGroupClient) ListComplete(ctx context.Context) (result ExpressRouteServiceProviderListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/group.go b/services/network/mgmt/2017-11-01/network/group.go
new file mode 100644
index 000000000000..42a78a8bae27
--- /dev/null
+++ b/services/network/mgmt/2017-11-01/network/group.go
@@ -0,0 +1,107 @@
+package network
+
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"context"
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"net/http"
+)
+
+// GroupClient is the network Client
+type GroupClient struct {
+	BaseClient
+}
+
+// NewGroupClient creates an instance of the GroupClient client.
+func NewGroupClient(subscriptionID string) GroupClient {
+	return NewGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
+}
+
+// NewGroupClientWithBaseURI creates an instance of the GroupClient client.
+func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
+	return GroupClient{NewWithBaseURI(baseURI, subscriptionID)}
+}
+
+// CheckDNSNameAvailability checks whether a domain name in the cloudapp.azure.com zone is available for use.
+//
+// location is the location of the domain name. domainNameLabel is the domain name to be verified. It must conform
+// to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$.
+func (client GroupClient) CheckDNSNameAvailability(ctx context.Context, location string, domainNameLabel string) (result DNSNameAvailabilityResult, err error) {
+	req, err := client.CheckDNSNameAvailabilityPreparer(ctx, location, domainNameLabel)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := client.CheckDNSNameAvailabilitySender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure sending request")
+		return
+	}
+
+	result, err = client.CheckDNSNameAvailabilityResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.GroupClient", "CheckDNSNameAvailability", resp, "Failure responding to request")
+	}
+
+	return
+}
+
+// CheckDNSNameAvailabilityPreparer prepares the CheckDNSNameAvailability request.
+func (client GroupClient) CheckDNSNameAvailabilityPreparer(ctx context.Context, location string, domainNameLabel string) (*http.Request, error) {
+	pathParameters := map[string]interface{}{
+		"location":       autorest.Encode("path", location),
+		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
+	}
+
+	const APIVersion = "2017-11-01"
+	queryParameters := map[string]interface{}{
+		"api-version":     APIVersion,
+		"domainNameLabel": autorest.Encode("query", domainNameLabel),
+	}
+
+	preparer := autorest.CreatePreparer(
+		autorest.AsGet(),
+		autorest.WithBaseURL(client.BaseURI),
+		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability", pathParameters),
+		autorest.WithQueryParameters(queryParameters))
+	return preparer.Prepare((&http.Request{}).WithContext(ctx))
+}
+
+// CheckDNSNameAvailabilitySender sends the CheckDNSNameAvailability request. The method will close the
+// http.Response Body if it receives an error.
+func (client GroupClient) CheckDNSNameAvailabilitySender(req *http.Request) (*http.Response, error) {
+	return autorest.SendWithSender(client, req,
+		azure.DoRetryWithRegistration(client.Client))
+}
+
+// CheckDNSNameAvailabilityResponder handles the response to the CheckDNSNameAvailability request. The method always
+// closes the http.Response Body.
+func (client GroupClient) CheckDNSNameAvailabilityResponder(resp *http.Response) (result DNSNameAvailabilityResult, err error) {
+	err = autorest.Respond(
+		resp,
+		client.ByInspecting(),
+		azure.WithErrorUnlessStatusCode(http.StatusOK),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}
diff --git a/services/network/mgmt/2017-11-01/network/inboundnatrules.go b/services/network/mgmt/2017-11-01/network/inboundnatrulesgroup.go
similarity index 74%
rename from services/network/mgmt/2017-11-01/network/inboundnatrules.go
rename to services/network/mgmt/2017-11-01/network/inboundnatrulesgroup.go
index dede58e282c9..c320fe89363f 100644
--- a/services/network/mgmt/2017-11-01/network/inboundnatrules.go
+++ b/services/network/mgmt/2017-11-01/network/inboundnatrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// InboundNatRulesClient is the network Client
-type InboundNatRulesClient struct {
+// InboundNatRulesGroupClient is the network Client
+type InboundNatRulesGroupClient struct {
 	BaseClient
 }
 
-// NewInboundNatRulesClient creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClient(subscriptionID string) InboundNatRulesClient {
-	return NewInboundNatRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInboundNatRulesGroupClient creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClient(subscriptionID string) InboundNatRulesGroupClient {
+	return NewInboundNatRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInboundNatRulesClientWithBaseURI creates an instance of the InboundNatRulesClient client.
-func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesClient {
-	return InboundNatRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInboundNatRulesGroupClientWithBaseURI creates an instance of the InboundNatRulesGroupClient client.
+func NewInboundNatRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesGroupClient {
+	return InboundNatRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer inbound nat rule.
@@ -45,7 +45,7 @@ func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. inboundNatRuleParameters is parameters supplied to the
 // create or update inbound nat rule operation.
-func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (result InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: inboundNatRuleParameters,
 			Constraints: []validation.Constraint{{Target: "inboundNatRuleParameters.InboundNatRulePropertiesFormat", Name: validation.Null, Rule: false,
@@ -62,18 +62,18 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 						}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.InboundNatRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.InboundNatRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, inboundNatRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -81,7 +81,7 @@ func (client InboundNatRulesClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, inboundNatRuleParameters InboundNatRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -106,7 +106,7 @@ func (client InboundNatRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesCreateOrUpdateFuture, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future InboundNatRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -121,7 +121,7 @@ func (client InboundNatRulesClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -136,16 +136,16 @@ func (client InboundNatRulesClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule.
-func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (result InboundNatRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -153,7 +153,7 @@ func (client InboundNatRulesClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -176,7 +176,7 @@ func (client InboundNatRulesClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future InboundNatRulesDeleteFuture, err error) {
+func (client InboundNatRulesGroupClient) DeleteSender(req *http.Request) (future InboundNatRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -191,7 +191,7 @@ func (client InboundNatRulesClient) DeleteSender(req *http.Request) (future Inbo
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InboundNatRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -205,30 +205,30 @@ func (client InboundNatRulesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // inboundNatRuleName is the name of the inbound nat rule. expand is expands referenced resources.
-func (client InboundNatRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (result InboundNatRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, inboundNatRuleName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, inboundNatRuleName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"inboundNatRuleName": autorest.Encode("path", inboundNatRuleName),
 		"loadBalancerName":   autorest.Encode("path", loadBalancerName),
@@ -254,14 +254,14 @@ func (client InboundNatRulesClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
+func (client InboundNatRulesGroupClient) GetResponder(resp *http.Response) (result InboundNatRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -275,31 +275,31 @@ func (client InboundNatRulesClient) GetResponder(resp *http.Response) (result In
 // List gets all the inbound nat rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client InboundNatRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
+func (client InboundNatRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.inrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.inrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client InboundNatRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -321,14 +321,14 @@ func (client InboundNatRulesClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InboundNatRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InboundNatRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) ListResponder(resp *http.Response) (result InboundNatRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -340,10 +340,10 @@ func (client InboundNatRulesClient) ListResponder(resp *http.Response) (result I
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
+func (client InboundNatRulesGroupClient) listNextResults(lastResults InboundNatRuleListResult) (result InboundNatRuleListResult, err error) {
 	req, err := lastResults.inboundNatRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -351,17 +351,17 @@ func (client InboundNatRulesClient) listNextResults(lastResults InboundNatRuleLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InboundNatRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
+func (client InboundNatRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InboundNatRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/interfaceipconfigurations.go b/services/network/mgmt/2017-11-01/network/interfaceipconfigurationsgroup.go
similarity index 66%
rename from services/network/mgmt/2017-11-01/network/interfaceipconfigurations.go
rename to services/network/mgmt/2017-11-01/network/interfaceipconfigurationsgroup.go
index ed176c177e9a..d272c21ba6ce 100644
--- a/services/network/mgmt/2017-11-01/network/interfaceipconfigurations.go
+++ b/services/network/mgmt/2017-11-01/network/interfaceipconfigurationsgroup.go
@@ -24,49 +24,50 @@ import (
 	"net/http"
 )
 
-// InterfaceIPConfigurationsClient is the network Client
-type InterfaceIPConfigurationsClient struct {
+// InterfaceIPConfigurationsGroupClient is the network Client
+type InterfaceIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceIPConfigurationsClient creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClient(subscriptionID string) InterfaceIPConfigurationsClient {
-	return NewInterfaceIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceIPConfigurationsGroupClient creates an instance of the InterfaceIPConfigurationsGroupClient client.
+func NewInterfaceIPConfigurationsGroupClient(subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return NewInterfaceIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceIPConfigurationsClientWithBaseURI creates an instance of the InterfaceIPConfigurationsClient client.
-func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsClient {
-	return InterfaceIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceIPConfigurationsGroupClientWithBaseURI creates an instance of the InterfaceIPConfigurationsGroupClient
+// client.
+func NewInterfaceIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsGroupClient {
+	return InterfaceIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified network interface ip configuration.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // IPConfigurationName is the name of the ip configuration name.
-func (client InterfaceIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (result InterfaceIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":  autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
@@ -89,14 +90,14 @@ func (client InterfaceIPConfigurationsClient) GetPreparer(ctx context.Context, r
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
+func (client InterfaceIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +111,31 @@ func (client InterfaceIPConfigurationsClient) GetResponder(resp *http.Response)
 // List get all ip configurations in a network interface
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
+func (client InterfaceIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.iiclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.iiclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -156,14 +157,14 @@ func (client InterfaceIPConfigurationsClient) ListPreparer(ctx context.Context,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +176,10 @@ func (client InterfaceIPConfigurationsClient) ListResponder(resp *http.Response)
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceIPConfigurationsClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfaceIPConfigurationsGroupClient) listNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
 	req, err := lastResults.interfaceIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +187,17 @@ func (client InterfaceIPConfigurationsClient) listNextResults(lastResults Interf
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
+func (client InterfaceIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/interfaceloadbalancers.go b/services/network/mgmt/2017-11-01/network/interfaceloadbalancersgroup.go
similarity index 63%
rename from services/network/mgmt/2017-11-01/network/interfaceloadbalancers.go
rename to services/network/mgmt/2017-11-01/network/interfaceloadbalancersgroup.go
index 502b7d469eaa..a621a19d109c 100644
--- a/services/network/mgmt/2017-11-01/network/interfaceloadbalancers.go
+++ b/services/network/mgmt/2017-11-01/network/interfaceloadbalancersgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// InterfaceLoadBalancersClient is the network Client
-type InterfaceLoadBalancersClient struct {
+// InterfaceLoadBalancersGroupClient is the network Client
+type InterfaceLoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewInterfaceLoadBalancersClient creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClient(subscriptionID string) InterfaceLoadBalancersClient {
-	return NewInterfaceLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfaceLoadBalancersGroupClient creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClient(subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return NewInterfaceLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfaceLoadBalancersClientWithBaseURI creates an instance of the InterfaceLoadBalancersClient client.
-func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersClient {
-	return InterfaceLoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfaceLoadBalancersGroupClientWithBaseURI creates an instance of the InterfaceLoadBalancersGroupClient client.
+func NewInterfaceLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersGroupClient {
+	return InterfaceLoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list all load balancers in a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfaceLoadBalancersClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
+func (client InterfaceLoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfaceLoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -88,14 +88,14 @@ func (client InterfaceLoadBalancersClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfaceLoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfaceLoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListResponder(resp *http.Response) (result InterfaceLoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -107,10 +107,10 @@ func (client InterfaceLoadBalancersClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfaceLoadBalancersClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
+func (client InterfaceLoadBalancersGroupClient) listNextResults(lastResults InterfaceLoadBalancerListResult) (result InterfaceLoadBalancerListResult, err error) {
 	req, err := lastResults.interfaceLoadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -118,17 +118,17 @@ func (client InterfaceLoadBalancersClient) listNextResults(lastResults Interface
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfaceLoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfaceLoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
+func (client InterfaceLoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfaceLoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkInterfaceName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/interfaces.go b/services/network/mgmt/2017-11-01/network/interfacesgroup.go
similarity index 66%
rename from services/network/mgmt/2017-11-01/network/interfaces.go
rename to services/network/mgmt/2017-11-01/network/interfacesgroup.go
index 3ba26587d082..6761badaac32 100644
--- a/services/network/mgmt/2017-11-01/network/interfaces.go
+++ b/services/network/mgmt/2017-11-01/network/interfacesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// InterfacesClient is the network Client
-type InterfacesClient struct {
+// InterfacesGroupClient is the network Client
+type InterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewInterfacesClient creates an instance of the InterfacesClient client.
-func NewInterfacesClient(subscriptionID string) InterfacesClient {
-	return NewInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewInterfacesGroupClient creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClient(subscriptionID string) InterfacesGroupClient {
+	return NewInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewInterfacesClientWithBaseURI creates an instance of the InterfacesClient client.
-func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
-	return InterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewInterfacesGroupClientWithBaseURI creates an instance of the InterfacesGroupClient client.
+func NewInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) InterfacesGroupClient {
+	return InterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // parameters is parameters supplied to the create or update network interface operation.
-func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (result InterfacesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkInterfaceName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client InterfacesClient) CreateOrUpdate(ctx context.Context, resourceGroup
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
+func (client InterfacesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters Interface) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client InterfacesClient) CreateOrUpdatePreparer(ctx context.Context, resou
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future InterfacesCreateOrUpdateFuture, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateSender(req *http.Request) (future InterfacesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client InterfacesClient) CreateOrUpdateSender(req *http.Request) (future I
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client InterfacesClient) CreateOrUpdateResponder(resp *http.Response) (res
 // Delete deletes the specified network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client InterfacesClient) Delete(ctx context.Context, resourceGroupName str
 }
 
 // DeletePreparer prepares the Delete request.
-func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client InterfacesClient) DeletePreparer(ctx context.Context, resourceGroup
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) DeleteSender(req *http.Request) (future InterfacesDeleteFuture, err error) {
+func (client InterfacesGroupClient) DeleteSender(req *http.Request) (future InterfacesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client InterfacesClient) DeleteSender(req *http.Request) (future Interface
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client InterfacesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client InterfacesClient) DeleteResponder(resp *http.Response) (result auto
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // expand is expands referenced resources.
-func (client InterfacesClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) Get(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client InterfacesClient) GetPreparer(ctx context.Context, resourceGroupNam
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,16 +250,16 @@ func (client InterfacesClient) GetResponder(resp *http.Response) (result Interfa
 // GetEffectiveRouteTable gets all route tables applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTable(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	req, err := client.GetEffectiveRouteTablePreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetEffectiveRouteTableSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetEffectiveRouteTable", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -267,7 +267,7 @@ func (client InterfacesClient) GetEffectiveRouteTable(ctx context.Context, resou
 }
 
 // GetEffectiveRouteTablePreparer prepares the GetEffectiveRouteTable request.
-func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTablePreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -289,7 +289,7 @@ func (client InterfacesClient) GetEffectiveRouteTablePreparer(ctx context.Contex
 
 // GetEffectiveRouteTableSender sends the GetEffectiveRouteTable request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGetEffectiveRouteTableFuture, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableSender(req *http.Request) (future InterfacesGroupGetEffectiveRouteTableFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -304,7 +304,7 @@ func (client InterfacesClient) GetEffectiveRouteTableSender(req *http.Request) (
 
 // GetEffectiveRouteTableResponder handles the response to the GetEffectiveRouteTable request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
+func (client InterfacesGroupClient) GetEffectiveRouteTableResponder(resp *http.Response) (result EffectiveRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -322,30 +322,30 @@ func (client InterfacesClient) GetEffectiveRouteTableResponder(resp *http.Respon
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. IPConfigurationName is the name of the ip configuration. expand is expands referenced
 // resources.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfiguration(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (result InterfaceIPConfiguration, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfiguration(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (result InterfaceIPConfiguration, err error) {
 	req, err := client.GetVirtualMachineScaleSetIPConfigurationPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetIPConfiguration", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetIPConfiguration", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetIPConfigurationSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetIPConfigurationResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetIPConfiguration", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetIPConfigurationPreparer prepares the GetVirtualMachineScaleSetIPConfiguration request.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfigurationPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -373,14 +373,14 @@ func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationPreparer(
 
 // GetVirtualMachineScaleSetIPConfigurationSender sends the GetVirtualMachineScaleSetIPConfiguration request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfigurationSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetIPConfigurationResponder handles the response to the GetVirtualMachineScaleSetIPConfiguration request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetIPConfigurationResponder(resp *http.Response) (result InterfaceIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -396,30 +396,30 @@ func (client InterfacesClient) GetVirtualMachineScaleSetIPConfigurationResponder
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. expand is expands referenced resources.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterface(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result Interface, err error) {
 	req, err := client.GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetNetworkInterfaceSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetNetworkInterfaceResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "GetVirtualMachineScaleSetNetworkInterface", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetNetworkInterfacePreparer prepares the GetVirtualMachineScaleSetNetworkInterface request.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfacePreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
@@ -446,14 +446,14 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfacePreparer
 
 // GetVirtualMachineScaleSetNetworkInterfaceSender sends the GetVirtualMachineScaleSetNetworkInterface request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetNetworkInterfaceResponder handles the response to the GetVirtualMachineScaleSetNetworkInterface request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) GetVirtualMachineScaleSetNetworkInterfaceResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -467,31 +467,31 @@ func (client InterfacesClient) GetVirtualMachineScaleSetNetworkInterfaceResponde
 // List gets all network interfaces in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client InterfacesClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) List(ctx context.Context, resourceGroupName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -512,14 +512,14 @@ func (client InterfacesClient) ListPreparer(ctx context.Context, resourceGroupNa
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -531,10 +531,10 @@ func (client InterfacesClient) ListResponder(resp *http.Response) (result Interf
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -542,47 +542,47 @@ func (client InterfacesClient) listNextResults(lastResults InterfaceListResult)
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network interfaces in a subscription.
-func (client InterfacesClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListAll(ctx context.Context) (result InterfaceListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client InterfacesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -602,14 +602,14 @@ func (client InterfacesClient) ListAllPreparer(ctx context.Context) (*http.Reque
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListAllResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -621,10 +621,10 @@ func (client InterfacesClient) ListAllResponder(resp *http.Response) (result Int
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listAllNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -632,17 +632,17 @@ func (client InterfacesClient) listAllNextResults(lastResults InterfaceListResul
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListAllComplete(ctx context.Context) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -650,16 +650,16 @@ func (client InterfacesClient) ListAllComplete(ctx context.Context) (result Inte
 // ListEffectiveNetworkSecurityGroups gets all network security groups applied to a network interface.
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroups(ctx context.Context, resourceGroupName string, networkInterfaceName string) (result InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	req, err := client.ListEffectiveNetworkSecurityGroupsPreparer(ctx, resourceGroupName, networkInterfaceName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListEffectiveNetworkSecurityGroupsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListEffectiveNetworkSecurityGroups", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -667,7 +667,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroups(ctx context.Co
 }
 
 // ListEffectiveNetworkSecurityGroupsPreparer prepares the ListEffectiveNetworkSecurityGroups request.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -689,7 +689,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsPreparer(ctx co
 
 // ListEffectiveNetworkSecurityGroupsSender sends the ListEffectiveNetworkSecurityGroups request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesListEffectiveNetworkSecurityGroupsFuture, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsSender(req *http.Request) (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -704,7 +704,7 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsSender(req *htt
 
 // ListEffectiveNetworkSecurityGroupsResponder handles the response to the ListEffectiveNetworkSecurityGroups request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
+func (client InterfacesGroupClient) ListEffectiveNetworkSecurityGroupsResponder(resp *http.Response) (result EffectiveNetworkSecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -721,31 +721,31 @@ func (client InterfacesClient) ListEffectiveNetworkSecurityGroupsResponder(resp
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. expand is expands referenced resources.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurations(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurations(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetIPConfigurationsNextResults
 	req, err := client.ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetIPConfigurations", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetIPConfigurations", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetIPConfigurationsSender(req)
 	if err != nil {
 		result.iiclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure sending request")
 		return
 	}
 
 	result.iiclr, err = client.ListVirtualMachineScaleSetIPConfigurationsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetIPConfigurations", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetIPConfigurationsPreparer prepares the ListVirtualMachineScaleSetIPConfigurations request.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
@@ -772,14 +772,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsPrepare
 
 // ListVirtualMachineScaleSetIPConfigurationsSender sends the ListVirtualMachineScaleSetIPConfigurations request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetIPConfigurationsResponder handles the response to the ListVirtualMachineScaleSetIPConfigurations request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsResponder(resp *http.Response) (result InterfaceIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -791,10 +791,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsRespond
 }
 
 // listVirtualMachineScaleSetIPConfigurationsNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetIPConfigurationsNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetIPConfigurationsNextResults(lastResults InterfaceIPConfigurationListResult) (result InterfaceIPConfigurationListResult, err error) {
 	req, err := lastResults.interfaceIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -802,17 +802,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetIPConfigurationsNextRes
 	resp, err := client.ListVirtualMachineScaleSetIPConfigurationsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetIPConfigurationsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetIPConfigurationsNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetIPConfigurationsComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetIPConfigurationsComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, expand string) (result InterfaceIPConfigurationListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetIPConfigurations(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, expand)
 	return
 }
@@ -821,31 +821,31 @@ func (client InterfacesClient) ListVirtualMachineScaleSetIPConfigurationsComplet
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -867,14 +867,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesPrepar
 
 // ListVirtualMachineScaleSetNetworkInterfacesSender sends the ListVirtualMachineScaleSetNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -886,10 +886,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesRespon
 }
 
 // listVirtualMachineScaleSetNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -897,17 +897,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetNetworkInterfacesNextRe
 	resp, err := client.ListVirtualMachineScaleSetNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -917,31 +917,31 @@ func (client InterfacesClient) ListVirtualMachineScaleSetNetworkInterfacesComple
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfaces(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMNetworkInterfacesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "ListVirtualMachineScaleSetVMNetworkInterfaces", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesPreparer prepares the ListVirtualMachineScaleSetVMNetworkInterfaces request.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -964,14 +964,14 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesPrep
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesSender sends the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesResponder handles the response to the ListVirtualMachineScaleSetVMNetworkInterfaces request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -983,10 +983,10 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesResp
 }
 
 // listVirtualMachineScaleSetVMNetworkInterfacesNextResults retrieves the next set of results, if any.
-func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client InterfacesGroupClient) listVirtualMachineScaleSetVMNetworkInterfacesNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -994,17 +994,17 @@ func (client InterfacesClient) listVirtualMachineScaleSetVMNetworkInterfacesNext
 	resp, err := client.ListVirtualMachineScaleSetVMNetworkInterfacesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMNetworkInterfacesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "listVirtualMachineScaleSetVMNetworkInterfacesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMNetworkInterfacesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
+func (client InterfacesGroupClient) ListVirtualMachineScaleSetVMNetworkInterfacesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMNetworkInterfaces(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex)
 	return
 }
@@ -1013,16 +1013,16 @@ func (client InterfacesClient) ListVirtualMachineScaleSetVMNetworkInterfacesComp
 //
 // resourceGroupName is the name of the resource group. networkInterfaceName is the name of the network interface.
 // parameters is parameters supplied to update network interface tags.
-func (client InterfacesClient) UpdateTags(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (result InterfacesUpdateTagsFuture, err error) {
+func (client InterfacesGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (result InterfacesGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkInterfaceName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1030,7 +1030,7 @@ func (client InterfacesClient) UpdateTags(ctx context.Context, resourceGroupName
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client InterfacesClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (*http.Request, error) {
+func (client InterfacesGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkInterfaceName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkInterfaceName": autorest.Encode("path", networkInterfaceName),
 		"resourceGroupName":    autorest.Encode("path", resourceGroupName),
@@ -1054,7 +1054,7 @@ func (client InterfacesClient) UpdateTagsPreparer(ctx context.Context, resourceG
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client InterfacesClient) UpdateTagsSender(req *http.Request) (future InterfacesUpdateTagsFuture, err error) {
+func (client InterfacesGroupClient) UpdateTagsSender(req *http.Request) (future InterfacesGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1069,7 +1069,7 @@ func (client InterfacesClient) UpdateTagsSender(req *http.Request) (future Inter
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client InterfacesClient) UpdateTagsResponder(resp *http.Response) (result Interface, err error) {
+func (client InterfacesGroupClient) UpdateTagsResponder(resp *http.Response) (result Interface, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/loadbalancerbackendaddresspools.go b/services/network/mgmt/2017-11-01/network/loadbalancerbackendaddresspoolsgroup.go
similarity index 64%
rename from services/network/mgmt/2017-11-01/network/loadbalancerbackendaddresspools.go
rename to services/network/mgmt/2017-11-01/network/loadbalancerbackendaddresspoolsgroup.go
index 535f3904d2a8..c048ed3fa697 100644
--- a/services/network/mgmt/2017-11-01/network/loadbalancerbackendaddresspools.go
+++ b/services/network/mgmt/2017-11-01/network/loadbalancerbackendaddresspoolsgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerBackendAddressPoolsClient is the network Client
-type LoadBalancerBackendAddressPoolsClient struct {
+// LoadBalancerBackendAddressPoolsGroupClient is the network Client
+type LoadBalancerBackendAddressPoolsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerBackendAddressPoolsClient creates an instance of the LoadBalancerBackendAddressPoolsClient client.
-func NewLoadBalancerBackendAddressPoolsClient(subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return NewLoadBalancerBackendAddressPoolsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerBackendAddressPoolsGroupClient creates an instance of the LoadBalancerBackendAddressPoolsGroupClient
+// client.
+func NewLoadBalancerBackendAddressPoolsGroupClient(subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerBackendAddressPoolsClientWithBaseURI creates an instance of the LoadBalancerBackendAddressPoolsClient
-// client.
-func NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsClient {
-	return LoadBalancerBackendAddressPoolsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerBackendAddressPoolsGroupClient client.
+func NewLoadBalancerBackendAddressPoolsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerBackendAddressPoolsGroupClient {
+	return LoadBalancerBackendAddressPoolsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer backend address pool.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // backendAddressPoolName is the name of the backend address pool.
-func (client LoadBalancerBackendAddressPoolsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (result BackendAddressPool, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, backendAddressPoolName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, backendAddressPoolName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"backendAddressPoolName": autorest.Encode("path", backendAddressPoolName),
 		"loadBalancerName":       autorest.Encode("path", loadBalancerName),
@@ -90,14 +91,14 @@ func (client LoadBalancerBackendAddressPoolsClient) GetPreparer(ctx context.Cont
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) GetResponder(resp *http.Response) (result BackendAddressPool, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerBackendAddressPoolsClient) GetResponder(resp *http.Resp
 // List gets all the load balancer backed address pools.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerBackendAddressPoolsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbbaplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbbaplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerBackendAddressPoolsClient) ListPreparer(ctx context.Con
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerBackendAddressPoolsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerBackendAddressPoolsClient) ListResponder(resp *http.Res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) listNextResults(lastResults LoadBalancerBackendAddressPoolListResult) (result LoadBalancerBackendAddressPoolListResult, err error) {
 	req, err := lastResults.loadBalancerBackendAddressPoolListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerBackendAddressPoolsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerBackendAddressPoolsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerBackendAddressPoolsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
+func (client LoadBalancerBackendAddressPoolsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerBackendAddressPoolListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/loadbalancerfrontendipconfigurations.go b/services/network/mgmt/2017-11-01/network/loadbalancerfrontendipconfigurationsgroup.go
similarity index 63%
rename from services/network/mgmt/2017-11-01/network/loadbalancerfrontendipconfigurations.go
rename to services/network/mgmt/2017-11-01/network/loadbalancerfrontendipconfigurationsgroup.go
index e09a4e4879ed..f874da3a6643 100644
--- a/services/network/mgmt/2017-11-01/network/loadbalancerfrontendipconfigurations.go
+++ b/services/network/mgmt/2017-11-01/network/loadbalancerfrontendipconfigurationsgroup.go
@@ -24,51 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerFrontendIPConfigurationsClient is the network Client
-type LoadBalancerFrontendIPConfigurationsClient struct {
+// LoadBalancerFrontendIPConfigurationsGroupClient is the network Client
+type LoadBalancerFrontendIPConfigurationsGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClient creates an instance of the LoadBalancerFrontendIPConfigurationsClient
-// client.
-func NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerFrontendIPConfigurationsGroupClient creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI creates an instance of the
-// LoadBalancerFrontendIPConfigurationsClient client.
-func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return LoadBalancerFrontendIPConfigurationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI creates an instance of the
+// LoadBalancerFrontendIPConfigurationsGroupClient client.
+func NewLoadBalancerFrontendIPConfigurationsGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsGroupClient {
+	return LoadBalancerFrontendIPConfigurationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer frontend IP configuration.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // frontendIPConfigurationName is the name of the frontend IP configuration.
-func (client LoadBalancerFrontendIPConfigurationsClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (result FrontendIPConfiguration, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, frontendIPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, frontendIPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"frontendIPConfigurationName": autorest.Encode("path", frontendIPConfigurationName),
 		"loadBalancerName":            autorest.Encode("path", loadBalancerName),
@@ -91,14 +91,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetPreparer(ctx context
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) GetResponder(resp *http.Response) (result FrontendIPConfiguration, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -112,31 +112,31 @@ func (client LoadBalancerFrontendIPConfigurationsClient) GetResponder(resp *http
 // List gets all the load balancer frontend IP configurations.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerFrontendIPConfigurationsClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbficlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbficlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -158,14 +158,14 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListPreparer(ctx contex
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListResponder(resp *http.Response) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -177,10 +177,10 @@ func (client LoadBalancerFrontendIPConfigurationsClient) ListResponder(resp *htt
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) listNextResults(lastResults LoadBalancerFrontendIPConfigurationListResult) (result LoadBalancerFrontendIPConfigurationListResult, err error) {
 	req, err := lastResults.loadBalancerFrontendIPConfigurationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -188,17 +188,17 @@ func (client LoadBalancerFrontendIPConfigurationsClient) listNextResults(lastRes
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerFrontendIPConfigurationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerFrontendIPConfigurationsClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
+func (client LoadBalancerFrontendIPConfigurationsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerFrontendIPConfigurationListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/loadbalancerloadbalancingrules.go b/services/network/mgmt/2017-11-01/network/loadbalancerloadbalancingrulesgroup.go
similarity index 65%
rename from services/network/mgmt/2017-11-01/network/loadbalancerloadbalancingrules.go
rename to services/network/mgmt/2017-11-01/network/loadbalancerloadbalancingrulesgroup.go
index 268e0aff60c8..554c57bbf582 100644
--- a/services/network/mgmt/2017-11-01/network/loadbalancerloadbalancingrules.go
+++ b/services/network/mgmt/2017-11-01/network/loadbalancerloadbalancingrulesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerLoadBalancingRulesClient is the network Client
-type LoadBalancerLoadBalancingRulesClient struct {
+// LoadBalancerLoadBalancingRulesGroupClient is the network Client
+type LoadBalancerLoadBalancingRulesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerLoadBalancingRulesClient creates an instance of the LoadBalancerLoadBalancingRulesClient client.
-func NewLoadBalancerLoadBalancingRulesClient(subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return NewLoadBalancerLoadBalancingRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerLoadBalancingRulesGroupClient creates an instance of the LoadBalancerLoadBalancingRulesGroupClient
+// client.
+func NewLoadBalancerLoadBalancingRulesGroupClient(subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerLoadBalancingRulesClientWithBaseURI creates an instance of the LoadBalancerLoadBalancingRulesClient
-// client.
-func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return LoadBalancerLoadBalancingRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerLoadBalancingRulesGroupClient client.
+func NewLoadBalancerLoadBalancingRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesGroupClient {
+	return LoadBalancerLoadBalancingRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets the specified load balancer load balancing rule.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // loadBalancingRuleName is the name of the load balancing rule.
-func (client LoadBalancerLoadBalancingRulesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (result LoadBalancingRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, loadBalancingRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, loadBalancingRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":      autorest.Encode("path", loadBalancerName),
 		"loadBalancingRuleName": autorest.Encode("path", loadBalancingRuleName),
@@ -90,14 +91,14 @@ func (client LoadBalancerLoadBalancingRulesClient) GetPreparer(ctx context.Conte
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) GetResponder(resp *http.Response) (result LoadBalancingRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -111,31 +112,31 @@ func (client LoadBalancerLoadBalancingRulesClient) GetResponder(resp *http.Respo
 // List gets all the load balancing rules in a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerLoadBalancingRulesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblbrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblbrlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -157,14 +158,14 @@ func (client LoadBalancerLoadBalancingRulesClient) ListPreparer(ctx context.Cont
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerLoadBalancingRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -176,10 +177,10 @@ func (client LoadBalancerLoadBalancingRulesClient) ListResponder(resp *http.Resp
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) listNextResults(lastResults LoadBalancerLoadBalancingRuleListResult) (result LoadBalancerLoadBalancingRuleListResult, err error) {
 	req, err := lastResults.loadBalancerLoadBalancingRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -187,17 +188,17 @@ func (client LoadBalancerLoadBalancingRulesClient) listNextResults(lastResults L
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerLoadBalancingRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerLoadBalancingRulesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
+func (client LoadBalancerLoadBalancingRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerLoadBalancingRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/loadbalancernetworkinterfaces.go b/services/network/mgmt/2017-11-01/network/loadbalancernetworkinterfacesgroup.go
similarity index 62%
rename from services/network/mgmt/2017-11-01/network/loadbalancernetworkinterfaces.go
rename to services/network/mgmt/2017-11-01/network/loadbalancernetworkinterfacesgroup.go
index a932ee1067e3..3b9531e50a63 100644
--- a/services/network/mgmt/2017-11-01/network/loadbalancernetworkinterfaces.go
+++ b/services/network/mgmt/2017-11-01/network/loadbalancernetworkinterfacesgroup.go
@@ -24,50 +24,51 @@ import (
 	"net/http"
 )
 
-// LoadBalancerNetworkInterfacesClient is the network Client
-type LoadBalancerNetworkInterfacesClient struct {
+// LoadBalancerNetworkInterfacesGroupClient is the network Client
+type LoadBalancerNetworkInterfacesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerNetworkInterfacesClient creates an instance of the LoadBalancerNetworkInterfacesClient client.
-func NewLoadBalancerNetworkInterfacesClient(subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return NewLoadBalancerNetworkInterfacesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerNetworkInterfacesGroupClient creates an instance of the LoadBalancerNetworkInterfacesGroupClient
+// client.
+func NewLoadBalancerNetworkInterfacesGroupClient(subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerNetworkInterfacesClientWithBaseURI creates an instance of the LoadBalancerNetworkInterfacesClient
-// client.
-func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return LoadBalancerNetworkInterfacesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI creates an instance of the
+// LoadBalancerNetworkInterfacesGroupClient client.
+func NewLoadBalancerNetworkInterfacesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesGroupClient {
+	return LoadBalancerNetworkInterfacesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List gets associated load balancer network interfaces.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerNetworkInterfacesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ilr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ilr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -89,14 +90,14 @@ func (client LoadBalancerNetworkInterfacesClient) ListPreparer(ctx context.Conte
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerNetworkInterfacesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListResponder(resp *http.Response) (result InterfaceListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -108,10 +109,10 @@ func (client LoadBalancerNetworkInterfacesClient) ListResponder(resp *http.Respo
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) listNextResults(lastResults InterfaceListResult) (result InterfaceListResult, err error) {
 	req, err := lastResults.interfaceListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -119,17 +120,17 @@ func (client LoadBalancerNetworkInterfacesClient) listNextResults(lastResults In
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerNetworkInterfacesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerNetworkInterfacesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
+func (client LoadBalancerNetworkInterfacesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result InterfaceListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/loadbalancerprobes.go b/services/network/mgmt/2017-11-01/network/loadbalancerprobesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-11-01/network/loadbalancerprobes.go
rename to services/network/mgmt/2017-11-01/network/loadbalancerprobesgroup.go
index e4d281540b7a..bcc6e0686e9d 100644
--- a/services/network/mgmt/2017-11-01/network/loadbalancerprobes.go
+++ b/services/network/mgmt/2017-11-01/network/loadbalancerprobesgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// LoadBalancerProbesClient is the network Client
-type LoadBalancerProbesClient struct {
+// LoadBalancerProbesGroupClient is the network Client
+type LoadBalancerProbesGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancerProbesClient creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClient(subscriptionID string) LoadBalancerProbesClient {
-	return NewLoadBalancerProbesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancerProbesGroupClient creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClient(subscriptionID string) LoadBalancerProbesGroupClient {
+	return NewLoadBalancerProbesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancerProbesClientWithBaseURI creates an instance of the LoadBalancerProbesClient client.
-func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesClient {
-	return LoadBalancerProbesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancerProbesGroupClientWithBaseURI creates an instance of the LoadBalancerProbesGroupClient client.
+func NewLoadBalancerProbesGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesGroupClient {
+	return LoadBalancerProbesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Get gets load balancer probe.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // probeName is the name of the probe.
-func (client LoadBalancerProbesClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (result Probe, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, probeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, probeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"probeName":         autorest.Encode("path", probeName),
@@ -89,14 +89,14 @@ func (client LoadBalancerProbesClient) GetPreparer(ctx context.Context, resource
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result Probe, err error) {
+func (client LoadBalancerProbesGroupClient) GetResponder(resp *http.Response) (result Probe, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -110,31 +110,31 @@ func (client LoadBalancerProbesClient) GetResponder(resp *http.Response) (result
 // List gets all the load balancer probes.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancerProbesClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
+func (client LoadBalancerProbesGroupClient) List(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lbplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lbplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancerProbesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -156,14 +156,14 @@ func (client LoadBalancerProbesClient) ListPreparer(ctx context.Context, resourc
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancerProbesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancerProbesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) ListResponder(resp *http.Response) (result LoadBalancerProbeListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -175,10 +175,10 @@ func (client LoadBalancerProbesClient) ListResponder(resp *http.Response) (resul
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
+func (client LoadBalancerProbesGroupClient) listNextResults(lastResults LoadBalancerProbeListResult) (result LoadBalancerProbeListResult, err error) {
 	req, err := lastResults.loadBalancerProbeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -186,17 +186,17 @@ func (client LoadBalancerProbesClient) listNextResults(lastResults LoadBalancerP
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancerProbesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancerProbesClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
+func (client LoadBalancerProbesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancerProbeListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, loadBalancerName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/loadbalancers.go b/services/network/mgmt/2017-11-01/network/loadbalancersgroup.go
similarity index 66%
rename from services/network/mgmt/2017-11-01/network/loadbalancers.go
rename to services/network/mgmt/2017-11-01/network/loadbalancersgroup.go
index d2da3acade3e..c9bf3ef6dcd1 100644
--- a/services/network/mgmt/2017-11-01/network/loadbalancers.go
+++ b/services/network/mgmt/2017-11-01/network/loadbalancersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// LoadBalancersClient is the network Client
-type LoadBalancersClient struct {
+// LoadBalancersGroupClient is the network Client
+type LoadBalancersGroupClient struct {
 	BaseClient
 }
 
-// NewLoadBalancersClient creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClient(subscriptionID string) LoadBalancersClient {
-	return NewLoadBalancersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLoadBalancersGroupClient creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClient(subscriptionID string) LoadBalancersGroupClient {
+	return NewLoadBalancersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLoadBalancersClientWithBaseURI creates an instance of the LoadBalancersClient client.
-func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersClient {
-	return LoadBalancersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLoadBalancersGroupClientWithBaseURI creates an instance of the LoadBalancersGroupClient client.
+func NewLoadBalancersGroupClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancersGroupClient {
+	return LoadBalancersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // parameters is parameters supplied to the create or update load balancer operation.
-func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (result LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, loadBalancerName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client LoadBalancersClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
+func (client LoadBalancersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters LoadBalancer) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client LoadBalancersClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersCreateOrUpdateFuture, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateSender(req *http.Request) (future LoadBalancersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client LoadBalancersClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client LoadBalancersClient) CreateOrUpdateResponder(resp *http.Response) (
 // Delete deletes the specified load balancer.
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
-func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) Delete(ctx context.Context, resourceGroupName string, loadBalancerName string) (result LoadBalancersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, loadBalancerName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client LoadBalancersClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, loadBalancerName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -152,7 +152,7 @@ func (client LoadBalancersClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBalancersDeleteFuture, err error) {
+func (client LoadBalancersGroupClient) DeleteSender(req *http.Request) (future LoadBalancersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client LoadBalancersClient) DeleteSender(req *http.Request) (future LoadBa
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LoadBalancersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client LoadBalancersClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer. expand
 // is expands referenced resources.
-func (client LoadBalancersClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) Get(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (result LoadBalancer, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, loadBalancerName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -229,14 +229,14 @@ func (client LoadBalancersClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) GetResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client LoadBalancersClient) GetResponder(resp *http.Response) (result Load
 // List gets all the load balancers in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LoadBalancersClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) List(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client LoadBalancersClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client LoadBalancersClient) ListResponder(resp *http.Response) (result Loa
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client LoadBalancersClient) listNextResults(lastResults LoadBalancerListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the load balancers in a subscription.
-func (client LoadBalancersClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
+func (client LoadBalancersGroupClient) ListAll(ctx context.Context) (result LoadBalancerListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.lblr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.lblr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client LoadBalancersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client LoadBalancersClient) ListAllPreparer(ctx context.Context) (*http.Re
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client LoadBalancersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) ListAllResponder(resp *http.Response) (result LoadBalancerListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client LoadBalancersClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
+func (client LoadBalancersGroupClient) listAllNextResults(lastResults LoadBalancerListResult) (result LoadBalancerListResult, err error) {
 	req, err := lastResults.loadBalancerListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client LoadBalancersClient) listAllNextResults(lastResults LoadBalancerLis
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
+func (client LoadBalancersGroupClient) ListAllComplete(ctx context.Context) (result LoadBalancerListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -434,16 +434,16 @@ func (client LoadBalancersClient) ListAllComplete(ctx context.Context) (result L
 //
 // resourceGroupName is the name of the resource group. loadBalancerName is the name of the load balancer.
 // parameters is parameters supplied to update load balancer tags.
-func (client LoadBalancersClient) UpdateTags(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (result LoadBalancersUpdateTagsFuture, err error) {
+func (client LoadBalancersGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (result LoadBalancersGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, loadBalancerName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client LoadBalancersClient) UpdateTags(ctx context.Context, resourceGroupN
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client LoadBalancersClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (*http.Request, error) {
+func (client LoadBalancersGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, loadBalancerName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"loadBalancerName":  autorest.Encode("path", loadBalancerName),
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
@@ -475,7 +475,7 @@ func (client LoadBalancersClient) UpdateTagsPreparer(ctx context.Context, resour
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client LoadBalancersClient) UpdateTagsSender(req *http.Request) (future LoadBalancersUpdateTagsFuture, err error) {
+func (client LoadBalancersGroupClient) UpdateTagsSender(req *http.Request) (future LoadBalancersGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client LoadBalancersClient) UpdateTagsSender(req *http.Request) (future Lo
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client LoadBalancersClient) UpdateTagsResponder(resp *http.Response) (result LoadBalancer, err error) {
+func (client LoadBalancersGroupClient) UpdateTagsResponder(resp *http.Response) (result LoadBalancer, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/localnetworkgateways.go b/services/network/mgmt/2017-11-01/network/localnetworkgatewaysgroup.go
similarity index 72%
rename from services/network/mgmt/2017-11-01/network/localnetworkgateways.go
rename to services/network/mgmt/2017-11-01/network/localnetworkgatewaysgroup.go
index 0886d69d8fa0..983d03a28f14 100644
--- a/services/network/mgmt/2017-11-01/network/localnetworkgateways.go
+++ b/services/network/mgmt/2017-11-01/network/localnetworkgatewaysgroup.go
@@ -25,43 +25,43 @@ import (
 	"net/http"
 )
 
-// LocalNetworkGatewaysClient is the network Client
-type LocalNetworkGatewaysClient struct {
+// LocalNetworkGatewaysGroupClient is the network Client
+type LocalNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewLocalNetworkGatewaysClient creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
-	return NewLocalNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewLocalNetworkGatewaysGroupClient creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClient(subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return NewLocalNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewLocalNetworkGatewaysClientWithBaseURI creates an instance of the LocalNetworkGatewaysClient client.
-func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
-	return LocalNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewLocalNetworkGatewaysGroupClientWithBaseURI creates an instance of the LocalNetworkGatewaysGroupClient client.
+func NewLocalNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysGroupClient {
+	return LocalNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a local network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway. parameters is parameters supplied to the create or update local network gateway operation.
-func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (result LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}},
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, localNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -69,7 +69,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, res
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters LocalNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -93,7 +93,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Cont
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future LocalNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -108,7 +108,7 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request)
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -123,22 +123,22 @@ func (client LocalNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Resp
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Delete", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Delete", err.Error())
 	}
 
 	req, err := client.DeletePreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -146,7 +146,7 @@ func (client LocalNetworkGatewaysClient) Delete(ctx context.Context, resourceGro
 }
 
 // DeletePreparer prepares the Delete request.
-func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -168,7 +168,7 @@ func (client LocalNetworkGatewaysClient) DeletePreparer(ctx context.Context, res
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysDeleteFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future LocalNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -183,7 +183,7 @@ func (client LocalNetworkGatewaysClient) DeleteSender(req *http.Request) (future
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client LocalNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -197,36 +197,36 @@ func (client LocalNetworkGatewaysClient) DeleteResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway.
-func (client LocalNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (result LocalNetworkGateway, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "Get", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "Get", err.Error())
 	}
 
 	req, err := client.GetPreparer(ctx, resourceGroupName, localNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -248,14 +248,14 @@ func (client LocalNetworkGatewaysClient) GetPreparer(ctx context.Context, resour
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -269,31 +269,31 @@ func (client LocalNetworkGatewaysClient) GetResponder(resp *http.Response) (resu
 // List gets all the local network gateways in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client LocalNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
+func (client LocalNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.lnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.lnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -314,14 +314,14 @@ func (client LocalNetworkGatewaysClient) ListPreparer(ctx context.Context, resou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client LocalNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result LocalNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,10 +333,10 @@ func (client LocalNetworkGatewaysClient) ListResponder(resp *http.Response) (res
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
+func (client LocalNetworkGatewaysGroupClient) listNextResults(lastResults LocalNetworkGatewayListResult) (result LocalNetworkGatewayListResult, err error) {
 	req, err := lastResults.localNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -344,17 +344,17 @@ func (client LocalNetworkGatewaysClient) listNextResults(lastResults LocalNetwor
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
+func (client LocalNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result LocalNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -363,22 +363,22 @@ func (client LocalNetworkGatewaysClient) ListComplete(ctx context.Context, resou
 //
 // resourceGroupName is the name of the resource group. localNetworkGatewayName is the name of the local network
 // gateway. parameters is parameters supplied to update local network gateway tags.
-func (client LocalNetworkGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (result LocalNetworkGatewaysUpdateTagsFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (result LocalNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: localNetworkGatewayName,
 			Constraints: []validation.Constraint{{Target: "localNetworkGatewayName", Name: validation.MinLength, Rule: 1, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.LocalNetworkGatewaysClient", "UpdateTags", err.Error())
+		return result, validation.NewError("network.LocalNetworkGatewaysGroupClient", "UpdateTags", err.Error())
 	}
 
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, localNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -386,7 +386,7 @@ func (client LocalNetworkGatewaysClient) UpdateTags(ctx context.Context, resourc
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client LocalNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, localNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"localNetworkGatewayName": autorest.Encode("path", localNetworkGatewayName),
 		"resourceGroupName":       autorest.Encode("path", resourceGroupName),
@@ -410,7 +410,7 @@ func (client LocalNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context,
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client LocalNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (future LocalNetworkGatewaysUpdateTagsFuture, err error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTagsSender(req *http.Request) (future LocalNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -425,7 +425,7 @@ func (client LocalNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (fu
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client LocalNetworkGatewaysClient) UpdateTagsResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
+func (client LocalNetworkGatewaysGroupClient) UpdateTagsResponder(resp *http.Response) (result LocalNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/models.go b/services/network/mgmt/2017-11-01/network/models.go
index 03be474c243b..9b98a4e8393b 100644
--- a/services/network/mgmt/2017-11-01/network/models.go
+++ b/services/network/mgmt/2017-11-01/network/models.go
@@ -36,6 +36,11 @@ const (
 	Deny Access = "Deny"
 )
 
+// PossibleAccessValues returns an array of possible values for the Access const type.
+func PossibleAccessValues() [2]Access {
+	return [2]Access{Allow, Deny}
+}
+
 // ApplicationGatewayBackendHealthServerHealth enumerates the values for application gateway backend health
 // server health.
 type ApplicationGatewayBackendHealthServerHealth string
@@ -53,6 +58,11 @@ const (
 	Up ApplicationGatewayBackendHealthServerHealth = "Up"
 )
 
+// PossibleApplicationGatewayBackendHealthServerHealthValues returns an array of possible values for the ApplicationGatewayBackendHealthServerHealth const type.
+func PossibleApplicationGatewayBackendHealthServerHealthValues() [5]ApplicationGatewayBackendHealthServerHealth {
+	return [5]ApplicationGatewayBackendHealthServerHealth{Down, Draining, Partial, Unknown, Up}
+}
+
 // ApplicationGatewayCookieBasedAffinity enumerates the values for application gateway cookie based affinity.
 type ApplicationGatewayCookieBasedAffinity string
 
@@ -63,6 +73,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayFirewallMode enumerates the values for application gateway firewall mode.
 type ApplicationGatewayFirewallMode string
 
@@ -73,6 +88,11 @@ const (
 	Prevention ApplicationGatewayFirewallMode = "Prevention"
 )
 
+// PossibleApplicationGatewayFirewallModeValues returns an array of possible values for the ApplicationGatewayFirewallMode const type.
+func PossibleApplicationGatewayFirewallModeValues() [2]ApplicationGatewayFirewallMode {
+	return [2]ApplicationGatewayFirewallMode{Detection, Prevention}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -87,6 +107,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -97,6 +122,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRedirectType enumerates the values for application gateway redirect type.
 type ApplicationGatewayRedirectType string
 
@@ -111,6 +141,11 @@ const (
 	Temporary ApplicationGatewayRedirectType = "Temporary"
 )
 
+// PossibleApplicationGatewayRedirectTypeValues returns an array of possible values for the ApplicationGatewayRedirectType const type.
+func PossibleApplicationGatewayRedirectTypeValues() [4]ApplicationGatewayRedirectType {
+	return [4]ApplicationGatewayRedirectType{Found, Permanent, SeeOther, Temporary}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -122,6 +157,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -138,6 +178,11 @@ const (
 	WAFMedium ApplicationGatewaySkuName = "WAF_Medium"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [5]ApplicationGatewaySkuName {
+	return [5]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall, WAFLarge, WAFMedium}
+}
+
 // ApplicationGatewaySslCipherSuite enumerates the values for application gateway ssl cipher suite.
 type ApplicationGatewaySslCipherSuite string
 
@@ -194,6 +239,11 @@ const (
 	TLSRSAWITHAES256GCMSHA384 ApplicationGatewaySslCipherSuite = "TLS_RSA_WITH_AES_256_GCM_SHA384"
 )
 
+// PossibleApplicationGatewaySslCipherSuiteValues returns an array of possible values for the ApplicationGatewaySslCipherSuite const type.
+func PossibleApplicationGatewaySslCipherSuiteValues() [25]ApplicationGatewaySslCipherSuite {
+	return [25]ApplicationGatewaySslCipherSuite{TLSDHEDSSWITHAES128CBCSHA, TLSDHEDSSWITHAES128CBCSHA256, TLSDHEDSSWITHAES256CBCSHA, TLSDHEDSSWITHAES256CBCSHA256, TLSDHERSAWITHAES128CBCSHA, TLSDHERSAWITHAES128GCMSHA256, TLSDHERSAWITHAES256CBCSHA, TLSDHERSAWITHAES256GCMSHA384, TLSECDHEECDSAWITHAES128CBCSHA, TLSECDHEECDSAWITHAES128CBCSHA256, TLSECDHEECDSAWITHAES128GCMSHA256, TLSECDHEECDSAWITHAES256CBCSHA, TLSECDHEECDSAWITHAES256CBCSHA384, TLSECDHEECDSAWITHAES256GCMSHA384, TLSECDHERSAWITHAES128CBCSHA, TLSECDHERSAWITHAES128CBCSHA256, TLSECDHERSAWITHAES256CBCSHA, TLSECDHERSAWITHAES256CBCSHA384, TLSRSAWITH3DESEDECBCSHA, TLSRSAWITHAES128CBCSHA, TLSRSAWITHAES128CBCSHA256, TLSRSAWITHAES128GCMSHA256, TLSRSAWITHAES256CBCSHA, TLSRSAWITHAES256CBCSHA256, TLSRSAWITHAES256GCMSHA384}
+}
+
 // ApplicationGatewaySslPolicyName enumerates the values for application gateway ssl policy name.
 type ApplicationGatewaySslPolicyName string
 
@@ -206,6 +256,11 @@ const (
 	AppGwSslPolicy20170401S ApplicationGatewaySslPolicyName = "AppGwSslPolicy20170401S"
 )
 
+// PossibleApplicationGatewaySslPolicyNameValues returns an array of possible values for the ApplicationGatewaySslPolicyName const type.
+func PossibleApplicationGatewaySslPolicyNameValues() [3]ApplicationGatewaySslPolicyName {
+	return [3]ApplicationGatewaySslPolicyName{AppGwSslPolicy20150501, AppGwSslPolicy20170401, AppGwSslPolicy20170401S}
+}
+
 // ApplicationGatewaySslPolicyType enumerates the values for application gateway ssl policy type.
 type ApplicationGatewaySslPolicyType string
 
@@ -216,6 +271,11 @@ const (
 	Predefined ApplicationGatewaySslPolicyType = "Predefined"
 )
 
+// PossibleApplicationGatewaySslPolicyTypeValues returns an array of possible values for the ApplicationGatewaySslPolicyType const type.
+func PossibleApplicationGatewaySslPolicyTypeValues() [2]ApplicationGatewaySslPolicyType {
+	return [2]ApplicationGatewaySslPolicyType{Custom, Predefined}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -228,6 +288,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -238,6 +303,11 @@ const (
 	WAF ApplicationGatewayTier = "WAF"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [2]ApplicationGatewayTier {
+	return [2]ApplicationGatewayTier{Standard, WAF}
+}
+
 // AssociationType enumerates the values for association type.
 type AssociationType string
 
@@ -248,6 +318,11 @@ const (
 	Contains AssociationType = "Contains"
 )
 
+// PossibleAssociationTypeValues returns an array of possible values for the AssociationType const type.
+func PossibleAssociationTypeValues() [2]AssociationType {
+	return [2]AssociationType{Associated, Contains}
+}
+
 // AuthenticationMethod enumerates the values for authentication method.
 type AuthenticationMethod string
 
@@ -258,6 +333,11 @@ const (
 	EAPTLS AuthenticationMethod = "EAPTLS"
 )
 
+// PossibleAuthenticationMethodValues returns an array of possible values for the AuthenticationMethod const type.
+func PossibleAuthenticationMethodValues() [2]AuthenticationMethod {
+	return [2]AuthenticationMethod{EAPMSCHAPv2, EAPTLS}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -268,6 +348,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // BgpPeerState enumerates the values for bgp peer state.
 type BgpPeerState string
 
@@ -284,6 +369,11 @@ const (
 	BgpPeerStateUnknown BgpPeerState = "Unknown"
 )
 
+// PossibleBgpPeerStateValues returns an array of possible values for the BgpPeerState const type.
+func PossibleBgpPeerStateValues() [5]BgpPeerState {
+	return [5]BgpPeerState{BgpPeerStateConnected, BgpPeerStateConnecting, BgpPeerStateIdle, BgpPeerStateStopped, BgpPeerStateUnknown}
+}
+
 // ConnectionState enumerates the values for connection state.
 type ConnectionState string
 
@@ -296,6 +386,11 @@ const (
 	ConnectionStateUnreachable ConnectionState = "Unreachable"
 )
 
+// PossibleConnectionStateValues returns an array of possible values for the ConnectionState const type.
+func PossibleConnectionStateValues() [3]ConnectionState {
+	return [3]ConnectionState{ConnectionStateReachable, ConnectionStateUnknown, ConnectionStateUnreachable}
+}
+
 // ConnectionStatus enumerates the values for connection status.
 type ConnectionStatus string
 
@@ -310,6 +405,11 @@ const (
 	ConnectionStatusUnknown ConnectionStatus = "Unknown"
 )
 
+// PossibleConnectionStatusValues returns an array of possible values for the ConnectionStatus const type.
+func PossibleConnectionStatusValues() [4]ConnectionStatus {
+	return [4]ConnectionStatus{ConnectionStatusConnected, ConnectionStatusDegraded, ConnectionStatusDisconnected, ConnectionStatusUnknown}
+}
+
 // DhGroup enumerates the values for dh group.
 type DhGroup string
 
@@ -332,6 +432,11 @@ const (
 	None DhGroup = "None"
 )
 
+// PossibleDhGroupValues returns an array of possible values for the DhGroup const type.
+func PossibleDhGroupValues() [8]DhGroup {
+	return [8]DhGroup{DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+}
+
 // Direction enumerates the values for direction.
 type Direction string
 
@@ -342,6 +447,11 @@ const (
 	Outbound Direction = "Outbound"
 )
 
+// PossibleDirectionValues returns an array of possible values for the Direction const type.
+func PossibleDirectionValues() [2]Direction {
+	return [2]Direction{Inbound, Outbound}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -356,6 +466,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -366,6 +481,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // EffectiveSecurityRuleProtocol enumerates the values for effective security rule protocol.
 type EffectiveSecurityRuleProtocol string
 
@@ -378,6 +498,11 @@ const (
 	UDP EffectiveSecurityRuleProtocol = "Udp"
 )
 
+// PossibleEffectiveSecurityRuleProtocolValues returns an array of possible values for the EffectiveSecurityRuleProtocol const type.
+func PossibleEffectiveSecurityRuleProtocolValues() [3]EffectiveSecurityRuleProtocol {
+	return [3]EffectiveSecurityRuleProtocol{All, TCP, UDP}
+}
+
 // EvaluationState enumerates the values for evaluation state.
 type EvaluationState string
 
@@ -390,6 +515,11 @@ const (
 	NotStarted EvaluationState = "NotStarted"
 )
 
+// PossibleEvaluationStateValues returns an array of possible values for the EvaluationState const type.
+func PossibleEvaluationStateValues() [3]EvaluationState {
+	return [3]EvaluationState{Completed, InProgress, NotStarted}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -405,6 +535,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -415,6 +550,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -427,6 +567,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -437,6 +582,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -447,6 +597,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IkeEncryption enumerates the values for ike encryption.
 type IkeEncryption string
 
@@ -463,6 +618,11 @@ const (
 	DES3 IkeEncryption = "DES3"
 )
 
+// PossibleIkeEncryptionValues returns an array of possible values for the IkeEncryption const type.
+func PossibleIkeEncryptionValues() [5]IkeEncryption {
+	return [5]IkeEncryption{AES128, AES192, AES256, DES, DES3}
+}
+
 // IkeIntegrity enumerates the values for ike integrity.
 type IkeIntegrity string
 
@@ -477,6 +637,11 @@ const (
 	SHA384 IkeIntegrity = "SHA384"
 )
 
+// PossibleIkeIntegrityValues returns an array of possible values for the IkeIntegrity const type.
+func PossibleIkeIntegrityValues() [4]IkeIntegrity {
+	return [4]IkeIntegrity{MD5, SHA1, SHA256, SHA384}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -487,6 +652,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IpsecEncryption enumerates the values for ipsec encryption.
 type IpsecEncryption string
 
@@ -511,6 +681,11 @@ const (
 	IpsecEncryptionNone IpsecEncryption = "None"
 )
 
+// PossibleIpsecEncryptionValues returns an array of possible values for the IpsecEncryption const type.
+func PossibleIpsecEncryptionValues() [9]IpsecEncryption {
+	return [9]IpsecEncryption{IpsecEncryptionAES128, IpsecEncryptionAES192, IpsecEncryptionAES256, IpsecEncryptionDES, IpsecEncryptionDES3, IpsecEncryptionGCMAES128, IpsecEncryptionGCMAES192, IpsecEncryptionGCMAES256, IpsecEncryptionNone}
+}
+
 // IpsecIntegrity enumerates the values for ipsec integrity.
 type IpsecIntegrity string
 
@@ -529,6 +704,11 @@ const (
 	IpsecIntegritySHA256 IpsecIntegrity = "SHA256"
 )
 
+// PossibleIpsecIntegrityValues returns an array of possible values for the IpsecIntegrity const type.
+func PossibleIpsecIntegrityValues() [6]IpsecIntegrity {
+	return [6]IpsecIntegrity{IpsecIntegrityGCMAES128, IpsecIntegrityGCMAES192, IpsecIntegrityGCMAES256, IpsecIntegrityMD5, IpsecIntegritySHA1, IpsecIntegritySHA256}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -539,6 +719,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // IssueType enumerates the values for issue type.
 type IssueType string
 
@@ -563,6 +748,11 @@ const (
 	IssueTypeUserDefinedRoute IssueType = "UserDefinedRoute"
 )
 
+// PossibleIssueTypeValues returns an array of possible values for the IssueType const type.
+func PossibleIssueTypeValues() [9]IssueType {
+	return [9]IssueType{IssueTypeAgentStopped, IssueTypeDNSResolution, IssueTypeGuestFirewall, IssueTypeNetworkSecurityRule, IssueTypePlatform, IssueTypePortThrottled, IssueTypeSocketBind, IssueTypeUnknown, IssueTypeUserDefinedRoute}
+}
+
 // LoadBalancerSkuName enumerates the values for load balancer sku name.
 type LoadBalancerSkuName string
 
@@ -573,6 +763,11 @@ const (
 	LoadBalancerSkuNameStandard LoadBalancerSkuName = "Standard"
 )
 
+// PossibleLoadBalancerSkuNameValues returns an array of possible values for the LoadBalancerSkuName const type.
+func PossibleLoadBalancerSkuNameValues() [2]LoadBalancerSkuName {
+	return [2]LoadBalancerSkuName{LoadBalancerSkuNameBasic, LoadBalancerSkuNameStandard}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -585,6 +780,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // NextHopType enumerates the values for next hop type.
 type NextHopType string
 
@@ -603,6 +803,11 @@ const (
 	NextHopTypeVnetLocal NextHopType = "VnetLocal"
 )
 
+// PossibleNextHopTypeValues returns an array of possible values for the NextHopType const type.
+func PossibleNextHopTypeValues() [6]NextHopType {
+	return [6]NextHopType{NextHopTypeHyperNetGateway, NextHopTypeInternet, NextHopTypeNone, NextHopTypeVirtualAppliance, NextHopTypeVirtualNetworkGateway, NextHopTypeVnetLocal}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -615,6 +820,11 @@ const (
 	OperationStatusSucceeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{OperationStatusFailed, OperationStatusInProgress, OperationStatusSucceeded}
+}
+
 // Origin enumerates the values for origin.
 type Origin string
 
@@ -627,6 +837,11 @@ const (
 	OriginOutbound Origin = "Outbound"
 )
 
+// PossibleOriginValues returns an array of possible values for the Origin const type.
+func PossibleOriginValues() [3]Origin {
+	return [3]Origin{OriginInbound, OriginLocal, OriginOutbound}
+}
+
 // PcError enumerates the values for pc error.
 type PcError string
 
@@ -643,6 +858,11 @@ const (
 	StorageFailed PcError = "StorageFailed"
 )
 
+// PossiblePcErrorValues returns an array of possible values for the PcError const type.
+func PossiblePcErrorValues() [5]PcError {
+	return [5]PcError{AgentStopped, CaptureFailed, InternalError, LocalFileFailed, StorageFailed}
+}
+
 // PcProtocol enumerates the values for pc protocol.
 type PcProtocol string
 
@@ -655,6 +875,11 @@ const (
 	PcProtocolUDP PcProtocol = "UDP"
 )
 
+// PossiblePcProtocolValues returns an array of possible values for the PcProtocol const type.
+func PossiblePcProtocolValues() [3]PcProtocol {
+	return [3]PcProtocol{PcProtocolAny, PcProtocolTCP, PcProtocolUDP}
+}
+
 // PcStatus enumerates the values for pc status.
 type PcStatus string
 
@@ -671,6 +896,11 @@ const (
 	PcStatusUnknown PcStatus = "Unknown"
 )
 
+// PossiblePcStatusValues returns an array of possible values for the PcStatus const type.
+func PossiblePcStatusValues() [5]PcStatus {
+	return [5]PcStatus{PcStatusError, PcStatusNotStarted, PcStatusRunning, PcStatusStopped, PcStatusUnknown}
+}
+
 // PfsGroup enumerates the values for pfs group.
 type PfsGroup string
 
@@ -691,6 +921,11 @@ const (
 	PfsGroupPFS24 PfsGroup = "PFS24"
 )
 
+// PossiblePfsGroupValues returns an array of possible values for the PfsGroup const type.
+func PossiblePfsGroupValues() [7]PfsGroup {
+	return [7]PfsGroup{PfsGroupECP256, PfsGroupECP384, PfsGroupNone, PfsGroupPFS1, PfsGroupPFS2, PfsGroupPFS2048, PfsGroupPFS24}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -701,6 +936,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -711,6 +951,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // Protocol enumerates the values for protocol.
 type Protocol string
 
@@ -721,6 +966,11 @@ const (
 	ProtocolUDP Protocol = "UDP"
 )
 
+// PossibleProtocolValues returns an array of possible values for the Protocol const type.
+func PossibleProtocolValues() [2]Protocol {
+	return [2]Protocol{ProtocolTCP, ProtocolUDP}
+}
+
 // ProvisioningState enumerates the values for provisioning state.
 type ProvisioningState string
 
@@ -735,6 +985,11 @@ const (
 	Updating ProvisioningState = "Updating"
 )
 
+// PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type.
+func PossibleProvisioningStateValues() [4]ProvisioningState {
+	return [4]ProvisioningState{Deleting, Failed, Succeeded, Updating}
+}
+
 // PublicIPAddressSkuName enumerates the values for public ip address sku name.
 type PublicIPAddressSkuName string
 
@@ -745,6 +1000,11 @@ const (
 	PublicIPAddressSkuNameStandard PublicIPAddressSkuName = "Standard"
 )
 
+// PossiblePublicIPAddressSkuNameValues returns an array of possible values for the PublicIPAddressSkuName const type.
+func PossiblePublicIPAddressSkuNameValues() [2]PublicIPAddressSkuName {
+	return [2]PublicIPAddressSkuName{PublicIPAddressSkuNameBasic, PublicIPAddressSkuNameStandard}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -761,6 +1021,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -771,6 +1036,11 @@ const (
 	SecurityRuleAccessDeny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{SecurityRuleAccessAllow, SecurityRuleAccessDeny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -781,6 +1051,11 @@ const (
 	SecurityRuleDirectionOutbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{SecurityRuleDirectionInbound, SecurityRuleDirectionOutbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -793,6 +1068,11 @@ const (
 	SecurityRuleProtocolUDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{SecurityRuleProtocolAsterisk, SecurityRuleProtocolTCP, SecurityRuleProtocolUDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -807,6 +1087,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // Severity enumerates the values for severity.
 type Severity string
 
@@ -817,6 +1102,11 @@ const (
 	SeverityWarning Severity = "Warning"
 )
 
+// PossibleSeverityValues returns an array of possible values for the Severity const type.
+func PossibleSeverityValues() [2]Severity {
+	return [2]Severity{SeverityError, SeverityWarning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -829,6 +1119,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [3]TransportProtocol {
+	return [3]TransportProtocol{TransportProtocolAll, TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -843,6 +1138,11 @@ const (
 	VirtualNetworkGatewayConnectionStatusUnknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{VirtualNetworkGatewayConnectionStatusConnected, VirtualNetworkGatewayConnectionStatusConnecting, VirtualNetworkGatewayConnectionStatusNotConnected, VirtualNetworkGatewayConnectionStatusUnknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -857,6 +1157,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -877,6 +1182,11 @@ const (
 	VirtualNetworkGatewaySkuNameVpnGw3 VirtualNetworkGatewaySkuName = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [7]VirtualNetworkGatewaySkuName {
+	return [7]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance, VirtualNetworkGatewaySkuNameVpnGw1, VirtualNetworkGatewaySkuNameVpnGw2, VirtualNetworkGatewaySkuNameVpnGw3}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -897,6 +1207,11 @@ const (
 	VirtualNetworkGatewaySkuTierVpnGw3 VirtualNetworkGatewaySkuTier = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [7]VirtualNetworkGatewaySkuTier {
+	return [7]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance, VirtualNetworkGatewaySkuTierVpnGw1, VirtualNetworkGatewaySkuTierVpnGw2, VirtualNetworkGatewaySkuTierVpnGw3}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -907,6 +1222,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -919,6 +1239,11 @@ const (
 	Initiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{Connected, Disconnected, Initiated}
+}
+
 // VpnClientProtocol enumerates the values for vpn client protocol.
 type VpnClientProtocol string
 
@@ -929,6 +1254,11 @@ const (
 	SSTP VpnClientProtocol = "SSTP"
 )
 
+// PossibleVpnClientProtocolValues returns an array of possible values for the VpnClientProtocol const type.
+func PossibleVpnClientProtocolValues() [2]VpnClientProtocol {
+	return [2]VpnClientProtocol{IkeV2, SSTP}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -939,6 +1269,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
@@ -2632,29 +2967,29 @@ type ApplicationGatewayRequestRoutingRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// ApplicationGatewaysBackendHealthFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupBackendHealthFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysBackendHealthFuture struct {
+type ApplicationGatewaysGroupBackendHealthFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGatewaysClient) (agbh ApplicationGatewayBackendHealth, err error) {
+func (future ApplicationGatewaysGroupBackendHealthFuture) Result(client ApplicationGatewaysGroupClient) (agbh ApplicationGatewayBackendHealth, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysBackendHealthFuture")
+		return agbh, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupBackendHealthFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		agbh, err = client.BackendHealthResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2671,39 +3006,39 @@ func (future ApplicationGatewaysBackendHealthFuture) Result(client ApplicationGa
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	agbh, err = client.BackendHealthResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysBackendHealthFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupBackendHealthFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationGatewaysCreateOrUpdateFuture struct {
+type ApplicationGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) {
+func (future ApplicationGatewaysGroupCreateOrUpdateFuture) Result(client ApplicationGatewaysGroupClient) (ag ApplicationGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysCreateOrUpdateFuture")
+		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ag, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2720,39 +3055,39 @@ func (future ApplicationGatewaysCreateOrUpdateFuture) Result(client ApplicationG
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ag, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ApplicationGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ApplicationGatewaysDeleteFuture struct {
+type ApplicationGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
+func (future ApplicationGatewaysGroupDeleteFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -2769,12 +3104,159 @@ func (future ApplicationGatewaysDeleteFuture) Result(client ApplicationGatewaysC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStartFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStartFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStartFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStartFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StartResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StartResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStartFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type ApplicationGatewaysGroupStopFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupStopFuture) Result(client ApplicationGatewaysGroupClient) (ar autorest.Response, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupStopFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ar, err = client.StopResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ar, err = client.StopResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupStopFuture", "Result", resp, "Failure responding to request")
+	}
+	return
+}
+
+// ApplicationGatewaysGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type ApplicationGatewaysGroupUpdateTagsFuture struct {
+	azure.Future
+	req *http.Request
+}
+
+// Result returns the result of the asynchronous operation.
+// If the operation has not completed it will return an error.
+func (future ApplicationGatewaysGroupUpdateTagsFuture) Result(client ApplicationGatewaysGroupClient) (ag ApplicationGateway, err error) {
+	var done bool
+	done, err = future.Done(client)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		return
+	}
+	if !done {
+		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysGroupUpdateTagsFuture")
+	}
+	if future.PollingMethod() == azure.PollingLocation {
+		ag, err = client.UpdateTagsResponder(future.Response())
+		if err != nil {
+			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+		}
+		return
+	}
+	var req *http.Request
+	var resp *http.Response
+	if future.PollingURL() != "" {
+		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
+		if err != nil {
+			return
+		}
+	} else {
+		req = autorest.ChangeToGet(future.req)
+	}
+	resp, err = autorest.SendWithSender(client, req,
+		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
+		return
+	}
+	ag, err = client.UpdateTagsResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -2918,181 +3400,34 @@ func (agspp *ApplicationGatewaySslPredefinedPolicy) UnmarshalJSON(body []byte) e
 			}
 		case "properties":
 			if v != nil {
-				var applicationGatewaySslPredefinedPolicyPropertiesFormat ApplicationGatewaySslPredefinedPolicyPropertiesFormat
-				err = json.Unmarshal(*v, &applicationGatewaySslPredefinedPolicyPropertiesFormat)
-				if err != nil {
-					return err
-				}
-				agspp.ApplicationGatewaySslPredefinedPolicyPropertiesFormat = &applicationGatewaySslPredefinedPolicyPropertiesFormat
-			}
-		case "id":
-			if v != nil {
-				var ID string
-				err = json.Unmarshal(*v, &ID)
-				if err != nil {
-					return err
-				}
-				agspp.ID = &ID
-			}
-		}
-	}
-
-	return nil
-}
-
-// ApplicationGatewaySslPredefinedPolicyPropertiesFormat properties of ApplicationGatewaySslPredefinedPolicy
-type ApplicationGatewaySslPredefinedPolicyPropertiesFormat struct {
-	// CipherSuites - Ssl cipher suites to be enabled in the specified order for application gateway.
-	CipherSuites *[]ApplicationGatewaySslCipherSuite `json:"cipherSuites,omitempty"`
-	// MinProtocolVersion - Minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv10', 'TLSv11', 'TLSv12'
-	MinProtocolVersion ApplicationGatewaySslProtocol `json:"minProtocolVersion,omitempty"`
-}
-
-// ApplicationGatewaysStartFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStartFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStartFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStartFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StartResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StartResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStartFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
-// ApplicationGatewaysStopFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysStopFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysStopFuture) Result(client ApplicationGatewaysClient) (ar autorest.Response, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysStopFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ar, err = client.StopResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
-		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ar, err = client.StopResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysStopFuture", "Result", resp, "Failure responding to request")
-	}
-	return
-}
-
-// ApplicationGatewaysUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationGatewaysUpdateTagsFuture struct {
-	azure.Future
-	req *http.Request
-}
-
-// Result returns the result of the asynchronous operation.
-// If the operation has not completed it will return an error.
-func (future ApplicationGatewaysUpdateTagsFuture) Result(client ApplicationGatewaysClient) (ag ApplicationGateway, err error) {
-	var done bool
-	done, err = future.Done(client)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", future.Response(), "Polling failure")
-		return
-	}
-	if !done {
-		return ag, azure.NewAsyncOpIncompleteError("network.ApplicationGatewaysUpdateTagsFuture")
-	}
-	if future.PollingMethod() == azure.PollingLocation {
-		ag, err = client.UpdateTagsResponder(future.Response())
-		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
-		}
-		return
-	}
-	var req *http.Request
-	var resp *http.Response
-	if future.PollingURL() != "" {
-		req, err = http.NewRequest(http.MethodGet, future.PollingURL(), nil)
-		if err != nil {
-			return
+				var applicationGatewaySslPredefinedPolicyPropertiesFormat ApplicationGatewaySslPredefinedPolicyPropertiesFormat
+				err = json.Unmarshal(*v, &applicationGatewaySslPredefinedPolicyPropertiesFormat)
+				if err != nil {
+					return err
+				}
+				agspp.ApplicationGatewaySslPredefinedPolicyPropertiesFormat = &applicationGatewaySslPredefinedPolicyPropertiesFormat
+			}
+		case "id":
+			if v != nil {
+				var ID string
+				err = json.Unmarshal(*v, &ID)
+				if err != nil {
+					return err
+				}
+				agspp.ID = &ID
+			}
 		}
-	} else {
-		req = autorest.ChangeToGet(future.req)
-	}
-	resp, err = autorest.SendWithSender(client, req,
-		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request")
-		return
-	}
-	ag, err = client.UpdateTagsResponder(resp)
-	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
-	return
+
+	return nil
+}
+
+// ApplicationGatewaySslPredefinedPolicyPropertiesFormat properties of ApplicationGatewaySslPredefinedPolicy
+type ApplicationGatewaySslPredefinedPolicyPropertiesFormat struct {
+	// CipherSuites - Ssl cipher suites to be enabled in the specified order for application gateway.
+	CipherSuites *[]ApplicationGatewaySslCipherSuite `json:"cipherSuites,omitempty"`
+	// MinProtocolVersion - Minimum version of Ssl protocol to be supported on application gateway. Possible values include: 'TLSv10', 'TLSv11', 'TLSv12'
+	MinProtocolVersion ApplicationGatewaySslProtocol `json:"minProtocolVersion,omitempty"`
 }
 
 // ApplicationGatewayURLPathMap urlPathMaps give a url path to the backend mapping information for
@@ -3433,29 +3768,29 @@ type ApplicationSecurityGroupPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// ApplicationSecurityGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ApplicationSecurityGroupsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ApplicationSecurityGroupsCreateOrUpdateFuture struct {
+type ApplicationSecurityGroupsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client ApplicationSecurityGroupsClient) (asg ApplicationSecurityGroup, err error) {
+func (future ApplicationSecurityGroupsGroupCreateOrUpdateFuture) Result(client ApplicationSecurityGroupsGroupClient) (asg ApplicationSecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return asg, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsCreateOrUpdateFuture")
+		return asg, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		asg, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3472,39 +3807,39 @@ func (future ApplicationSecurityGroupsCreateOrUpdateFuture) Result(client Applic
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	asg, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ApplicationSecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ApplicationSecurityGroupsDeleteFuture struct {
+// ApplicationSecurityGroupsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type ApplicationSecurityGroupsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ApplicationSecurityGroupsDeleteFuture) Result(client ApplicationSecurityGroupsClient) (ar autorest.Response, err error) {
+func (future ApplicationSecurityGroupsGroupDeleteFuture) Result(client ApplicationSecurityGroupsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ApplicationSecurityGroupsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -3521,12 +3856,12 @@ func (future ApplicationSecurityGroupsDeleteFuture) Result(client ApplicationSec
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ApplicationSecurityGroupsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -4350,29 +4685,29 @@ type ConnectionMonitorResultProperties struct {
 	MonitoringIntervalInSeconds *int32 `json:"monitoringIntervalInSeconds,omitempty"`
 }
 
-// ConnectionMonitorsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ConnectionMonitorsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ConnectionMonitorsCreateOrUpdateFuture struct {
+type ConnectionMonitorsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsCreateOrUpdateFuture) Result(client ConnectionMonitorsClient) (cmr ConnectionMonitorResult, err error) {
+func (future ConnectionMonitorsGroupCreateOrUpdateFuture) Result(client ConnectionMonitorsGroupClient) (cmr ConnectionMonitorResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return cmr, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsCreateOrUpdateFuture")
+		return cmr, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		cmr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4389,39 +4724,39 @@ func (future ConnectionMonitorsCreateOrUpdateFuture) Result(client ConnectionMon
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	cmr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ConnectionMonitorsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ConnectionMonitorsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ConnectionMonitorsDeleteFuture struct {
+type ConnectionMonitorsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsDeleteFuture) Result(client ConnectionMonitorsClient) (ar autorest.Response, err error) {
+func (future ConnectionMonitorsGroupDeleteFuture) Result(client ConnectionMonitorsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4438,47 +4773,39 @@ func (future ConnectionMonitorsDeleteFuture) Result(client ConnectionMonitorsCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ConnectionMonitorSource describes the source of connection monitor.
-type ConnectionMonitorSource struct {
-	// ResourceID - The ID of the resource used as the source by connection monitor.
-	ResourceID *string `json:"resourceId,omitempty"`
-	// Port - The source port used by connection monitor.
-	Port *int32 `json:"port,omitempty"`
-}
-
-// ConnectionMonitorsQueryFuture an abstraction for monitoring and retrieving the results of a long-running
+// ConnectionMonitorsGroupQueryFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ConnectionMonitorsQueryFuture struct {
+type ConnectionMonitorsGroupQueryFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsQueryFuture) Result(client ConnectionMonitorsClient) (cmqr ConnectionMonitorQueryResult, err error) {
+func (future ConnectionMonitorsGroupQueryFuture) Result(client ConnectionMonitorsGroupClient) (cmqr ConnectionMonitorQueryResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsQueryFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupQueryFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return cmqr, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsQueryFuture")
+		return cmqr, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupQueryFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		cmqr, err = client.QueryResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsQueryFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupQueryFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4495,39 +4822,39 @@ func (future ConnectionMonitorsQueryFuture) Result(client ConnectionMonitorsClie
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsQueryFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupQueryFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	cmqr, err = client.QueryResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsQueryFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupQueryFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ConnectionMonitorsStartFuture an abstraction for monitoring and retrieving the results of a long-running
+// ConnectionMonitorsGroupStartFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ConnectionMonitorsStartFuture struct {
+type ConnectionMonitorsGroupStartFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsStartFuture) Result(client ConnectionMonitorsClient) (ar autorest.Response, err error) {
+func (future ConnectionMonitorsGroupStartFuture) Result(client ConnectionMonitorsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStartFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStartFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsStartFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupStartFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StartResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStartFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStartFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4544,39 +4871,39 @@ func (future ConnectionMonitorsStartFuture) Result(client ConnectionMonitorsClie
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStartFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStartFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StartResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStartFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStartFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ConnectionMonitorsStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// ConnectionMonitorsGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ConnectionMonitorsStopFuture struct {
+type ConnectionMonitorsGroupStopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ConnectionMonitorsStopFuture) Result(client ConnectionMonitorsClient) (ar autorest.Response, err error) {
+func (future ConnectionMonitorsGroupStopFuture) Result(client ConnectionMonitorsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsStopFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ConnectionMonitorsGroupStopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -4593,16 +4920,24 @@ func (future ConnectionMonitorsStopFuture) Result(client ConnectionMonitorsClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsStopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ConnectionMonitorsGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// ConnectionMonitorSource describes the source of connection monitor.
+type ConnectionMonitorSource struct {
+	// ResourceID - The ID of the resource used as the source by connection monitor.
+	ResourceID *string `json:"resourceId,omitempty"`
+	// Port - The source port used by connection monitor.
+	Port *int32 `json:"port,omitempty"`
+}
+
 // ConnectionResetSharedKey the virtual network connection reset shared key
 type ConnectionResetSharedKey struct {
 	autorest.Response `json:"-"`
@@ -5172,29 +5507,29 @@ func (erca *ExpressRouteCircuitAuthorization) UnmarshalJSON(body []byte) error {
 	return nil
 }
 
-// ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results
-// of a long-running operation.
-type ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (erca ExpressRouteCircuitAuthorization, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (erca ExpressRouteCircuitAuthorization, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture")
+		return erca, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erca, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5211,39 +5546,39 @@ func (future ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture) Result(clien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erca, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitAuthorizationsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitAuthorizationsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitAuthorizationsDeleteFuture struct {
+type ExpressRouteCircuitAuthorizationsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitAuthorizationsGroupDeleteFuture) Result(client ExpressRouteCircuitAuthorizationsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5260,12 +5595,12 @@ func (future ExpressRouteCircuitAuthorizationsDeleteFuture) Result(client Expres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitAuthorizationsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -5593,29 +5928,29 @@ type ExpressRouteCircuitPeeringPropertiesFormat struct {
 	Ipv6PeeringConfig *Ipv6ExpressRouteCircuitPeeringConfig `json:"ipv6PeeringConfig,omitempty"`
 }
 
-// ExpressRouteCircuitPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitPeeringsCreateOrUpdateFuture struct {
+// ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsClient) (ercp ExpressRouteCircuitPeering, err error) {
+func (future ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ercp ExpressRouteCircuitPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture")
+		return ercp, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5632,39 +5967,39 @@ func (future ExpressRouteCircuitPeeringsCreateOrUpdateFuture) Result(client Expr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitPeeringsDeleteFuture struct {
+type ExpressRouteCircuitPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRouteCircuitPeeringsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitPeeringsGroupDeleteFuture) Result(client ExpressRouteCircuitPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5681,12 +6016,12 @@ func (future ExpressRouteCircuitPeeringsDeleteFuture) Result(client ExpressRoute
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -5752,29 +6087,39 @@ type ExpressRouteCircuitsArpTableListResult struct {
 	NextLink *string `json:"nextLink,omitempty"`
 }
 
-// ExpressRouteCircuitsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
+type ExpressRouteCircuitServiceProviderProperties struct {
+	// ServiceProviderName - The serviceProviderName.
+	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
+	// PeeringLocation - The peering location.
+	PeeringLocation *string `json:"peeringLocation,omitempty"`
+	// BandwidthInMbps - The BandwidthInMbps.
+	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
+}
+
+// ExpressRouteCircuitsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsCreateOrUpdateFuture struct {
+type ExpressRouteCircuitsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) {
+func (future ExpressRouteCircuitsGroupCreateOrUpdateFuture) Result(client ExpressRouteCircuitsGroupClient) (erc ExpressRouteCircuit, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsCreateOrUpdateFuture")
+		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5791,39 +6136,39 @@ func (future ExpressRouteCircuitsCreateOrUpdateFuture) Result(client ExpressRout
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// ExpressRouteCircuitsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type ExpressRouteCircuitsDeleteFuture struct {
+type ExpressRouteCircuitsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuitsClient) (ar autorest.Response, err error) {
+func (future ExpressRouteCircuitsGroupDeleteFuture) Result(client ExpressRouteCircuitsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5840,59 +6185,39 @@ func (future ExpressRouteCircuitsDeleteFuture) Result(client ExpressRouteCircuit
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitServiceProviderProperties contains ServiceProviderProperties in an ExpressRouteCircuit.
-type ExpressRouteCircuitServiceProviderProperties struct {
-	// ServiceProviderName - The serviceProviderName.
-	ServiceProviderName *string `json:"serviceProviderName,omitempty"`
-	// PeeringLocation - The peering location.
-	PeeringLocation *string `json:"peeringLocation,omitempty"`
-	// BandwidthInMbps - The BandwidthInMbps.
-	BandwidthInMbps *int32 `json:"bandwidthInMbps,omitempty"`
-}
-
-// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
-type ExpressRouteCircuitSku struct {
-	// Name - The name of the SKU.
-	Name *string `json:"name,omitempty"`
-	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
-	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
-	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
-	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
-}
-
-// ExpressRouteCircuitsListArpTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListArpTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListArpTableFuture struct {
+type ExpressRouteCircuitsGroupListArpTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteCircuitsClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListArpTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercatlr ExpressRouteCircuitsArpTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListArpTableFuture")
+		return ercatlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListArpTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercatlr, err = client.ListArpTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5909,39 +6234,39 @@ func (future ExpressRouteCircuitsListArpTableFuture) Result(client ExpressRouteC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercatlr, err = client.ListArpTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListArpTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListArpTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
+// ExpressRouteCircuitsGroupListRoutesTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type ExpressRouteCircuitsListRoutesTableFuture struct {
+type ExpressRouteCircuitsGroupListRoutesTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRouteCircuitsClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtlr ExpressRouteCircuitsRoutesTableListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableFuture")
+		return ercrtlr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtlr, err = client.ListRoutesTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -5958,39 +6283,39 @@ func (future ExpressRouteCircuitsListRoutesTableFuture) Result(client ExpressRou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtlr, err = client.ListRoutesTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type ExpressRouteCircuitsListRoutesTableSummaryFuture struct {
+// ExpressRouteCircuitsGroupListRoutesTableSummaryFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type ExpressRouteCircuitsGroupListRoutesTableSummaryFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
+func (future ExpressRouteCircuitsGroupListRoutesTableSummaryFuture) Result(client ExpressRouteCircuitsGroupClient) (ercrtslr ExpressRouteCircuitsRoutesTableSummaryListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsListRoutesTableSummaryFuture")
+		return ercrtslr, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ercrtslr, err = client.ListRoutesTableSummaryResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6007,72 +6332,39 @@ func (future ExpressRouteCircuitsListRoutesTableSummaryFuture) Result(client Exp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ercrtslr, err = client.ListRoutesTableSummaryResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupListRoutesTableSummaryFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// ExpressRouteCircuitsRoutesTableListResult response for ListRoutesTable associated with the Express Route
-// Circuits API.
-type ExpressRouteCircuitsRoutesTableListResult struct {
-	autorest.Response `json:"-"`
-	// Value - The list of routes table.
-	Value *[]ExpressRouteCircuitRoutesTable `json:"value,omitempty"`
-	// NextLink - The URL to get the next set of results.
-	NextLink *string `json:"nextLink,omitempty"`
-}
-
-// ExpressRouteCircuitsRoutesTableSummaryListResult response for ListRoutesTable associated with the Express Route
-// Circuits API.
-type ExpressRouteCircuitsRoutesTableSummaryListResult struct {
-	autorest.Response `json:"-"`
-	// Value - A list of the routes table.
-	Value *[]ExpressRouteCircuitRoutesTableSummary `json:"value,omitempty"`
-	// NextLink - The URL to get the next set of results.
-	NextLink *string `json:"nextLink,omitempty"`
-}
-
-// ExpressRouteCircuitStats contains stats associated with the peering.
-type ExpressRouteCircuitStats struct {
-	autorest.Response `json:"-"`
-	// PrimarybytesIn - Gets BytesIn of the peering.
-	PrimarybytesIn *int64 `json:"primarybytesIn,omitempty"`
-	// PrimarybytesOut - Gets BytesOut of the peering.
-	PrimarybytesOut *int64 `json:"primarybytesOut,omitempty"`
-	// SecondarybytesIn - Gets BytesIn of the peering.
-	SecondarybytesIn *int64 `json:"secondarybytesIn,omitempty"`
-	// SecondarybytesOut - Gets BytesOut of the peering.
-	SecondarybytesOut *int64 `json:"secondarybytesOut,omitempty"`
-}
-
-// ExpressRouteCircuitsUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type ExpressRouteCircuitsUpdateTagsFuture struct {
+// ExpressRouteCircuitsGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type ExpressRouteCircuitsGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future ExpressRouteCircuitsUpdateTagsFuture) Result(client ExpressRouteCircuitsClient) (erc ExpressRouteCircuit, err error) {
+func (future ExpressRouteCircuitsGroupUpdateTagsFuture) Result(client ExpressRouteCircuitsGroupClient) (erc ExpressRouteCircuit, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsUpdateTagsFuture")
+		return erc, azure.NewAsyncOpIncompleteError("network.ExpressRouteCircuitsGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erc, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6089,16 +6381,59 @@ func (future ExpressRouteCircuitsUpdateTagsFuture) Result(client ExpressRouteCir
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erc, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.ExpressRouteCircuitsGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// ExpressRouteCircuitSku contains SKU in an ExpressRouteCircuit.
+type ExpressRouteCircuitSku struct {
+	// Name - The name of the SKU.
+	Name *string `json:"name,omitempty"`
+	// Tier - The tier of the SKU. Possible values are 'Standard' and 'Premium'. Possible values include: 'ExpressRouteCircuitSkuTierStandard', 'ExpressRouteCircuitSkuTierPremium'
+	Tier ExpressRouteCircuitSkuTier `json:"tier,omitempty"`
+	// Family - The family of the SKU. Possible values are: 'UnlimitedData' and 'MeteredData'. Possible values include: 'UnlimitedData', 'MeteredData'
+	Family ExpressRouteCircuitSkuFamily `json:"family,omitempty"`
+}
+
+// ExpressRouteCircuitsRoutesTableListResult response for ListRoutesTable associated with the Express Route
+// Circuits API.
+type ExpressRouteCircuitsRoutesTableListResult struct {
+	autorest.Response `json:"-"`
+	// Value - The list of routes table.
+	Value *[]ExpressRouteCircuitRoutesTable `json:"value,omitempty"`
+	// NextLink - The URL to get the next set of results.
+	NextLink *string `json:"nextLink,omitempty"`
+}
+
+// ExpressRouteCircuitsRoutesTableSummaryListResult response for ListRoutesTable associated with the Express Route
+// Circuits API.
+type ExpressRouteCircuitsRoutesTableSummaryListResult struct {
+	autorest.Response `json:"-"`
+	// Value - A list of the routes table.
+	Value *[]ExpressRouteCircuitRoutesTableSummary `json:"value,omitempty"`
+	// NextLink - The URL to get the next set of results.
+	NextLink *string `json:"nextLink,omitempty"`
+}
+
+// ExpressRouteCircuitStats contains stats associated with the peering.
+type ExpressRouteCircuitStats struct {
+	autorest.Response `json:"-"`
+	// PrimarybytesIn - Gets BytesIn of the peering.
+	PrimarybytesIn *int64 `json:"primarybytesIn,omitempty"`
+	// PrimarybytesOut - Gets BytesOut of the peering.
+	PrimarybytesOut *int64 `json:"primarybytesOut,omitempty"`
+	// SecondarybytesIn - Gets BytesIn of the peering.
+	SecondarybytesIn *int64 `json:"secondarybytesIn,omitempty"`
+	// SecondarybytesOut - Gets BytesOut of the peering.
+	SecondarybytesOut *int64 `json:"secondarybytesOut,omitempty"`
+}
+
 // ExpressRouteServiceProvider a ExpressRouteResourceProvider object.
 type ExpressRouteServiceProvider struct {
 	*ExpressRouteServiceProviderPropertiesFormat `json:"properties,omitempty"`
@@ -6776,29 +7111,29 @@ type InboundNatRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InboundNatRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type InboundNatRulesCreateOrUpdateFuture struct {
+// InboundNatRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type InboundNatRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesClient) (inr InboundNatRule, err error) {
+func (future InboundNatRulesGroupCreateOrUpdateFuture) Result(client InboundNatRulesGroupClient) (inr InboundNatRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesCreateOrUpdateFuture")
+		return inr, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		inr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6815,39 +7150,39 @@ func (future InboundNatRulesCreateOrUpdateFuture) Result(client InboundNatRulesC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	inr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InboundNatRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// InboundNatRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InboundNatRulesDeleteFuture struct {
+type InboundNatRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (ar autorest.Response, err error) {
+func (future InboundNatRulesGroupDeleteFuture) Result(client InboundNatRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InboundNatRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -6864,12 +7199,12 @@ func (future InboundNatRulesDeleteFuture) Result(client InboundNatRulesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InboundNatRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InboundNatRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -7441,29 +7776,29 @@ type InterfacePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// InterfacesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// InterfacesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type InterfacesCreateOrUpdateFuture struct {
+type InterfacesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i Interface, err error) {
+func (future InterfacesGroupCreateOrUpdateFuture) Result(client InterfacesGroupClient) (i Interface, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return i, azure.NewAsyncOpIncompleteError("network.InterfacesCreateOrUpdateFuture")
+		return i, azure.NewAsyncOpIncompleteError("network.InterfacesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		i, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7480,38 +7815,39 @@ func (future InterfacesCreateOrUpdateFuture) Result(client InterfacesClient) (i
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	i, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type InterfacesDeleteFuture struct {
+// InterfacesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type InterfacesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autorest.Response, err error) {
+func (future InterfacesGroupDeleteFuture) Result(client InterfacesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.InterfacesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7528,39 +7864,39 @@ func (future InterfacesDeleteFuture) Result(client InterfacesClient) (ar autores
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
+// InterfacesGroupGetEffectiveRouteTableFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type InterfacesGetEffectiveRouteTableFuture struct {
+type InterfacesGroupGetEffectiveRouteTableFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesClient) (erlr EffectiveRouteListResult, err error) {
+func (future InterfacesGroupGetEffectiveRouteTableFuture) Result(client InterfacesGroupClient) (erlr EffectiveRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGetEffectiveRouteTableFuture")
+		return erlr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupGetEffectiveRouteTableFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		erlr, err = client.GetEffectiveRouteTableResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7577,39 +7913,39 @@ func (future InterfacesGetEffectiveRouteTableFuture) Result(client InterfacesCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	erlr, err = client.GetEffectiveRouteTableResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupGetEffectiveRouteTableFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type InterfacesListEffectiveNetworkSecurityGroupsFuture struct {
+// InterfacesGroupListEffectiveNetworkSecurityGroupsFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type InterfacesGroupListEffectiveNetworkSecurityGroupsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
+func (future InterfacesGroupListEffectiveNetworkSecurityGroupsFuture) Result(client InterfacesGroupClient) (ensglr EffectiveNetworkSecurityGroupListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesListEffectiveNetworkSecurityGroupsFuture")
+		return ensglr, azure.NewAsyncOpIncompleteError("network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7626,38 +7962,39 @@ func (future InterfacesListEffectiveNetworkSecurityGroupsFuture) Result(client I
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ensglr, err = client.ListEffectiveNetworkSecurityGroupsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupListEffectiveNetworkSecurityGroupsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// InterfacesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type InterfacesUpdateTagsFuture struct {
+// InterfacesGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type InterfacesGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future InterfacesUpdateTagsFuture) Result(client InterfacesClient) (i Interface, err error) {
+func (future InterfacesGroupUpdateTagsFuture) Result(client InterfacesGroupClient) (i Interface, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return i, azure.NewAsyncOpIncompleteError("network.InterfacesUpdateTagsFuture")
+		return i, azure.NewAsyncOpIncompleteError("network.InterfacesGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		i, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -7674,12 +8011,12 @@ func (future InterfacesUpdateTagsFuture) Result(client InterfacesClient) (i Inte
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	i, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.InterfacesUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.InterfacesGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -8485,29 +8822,29 @@ type LoadBalancerPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LoadBalancersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type LoadBalancersCreateOrUpdateFuture struct {
+// LoadBalancersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type LoadBalancersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) {
+func (future LoadBalancersGroupCreateOrUpdateFuture) Result(client LoadBalancersGroupClient) (lb LoadBalancer, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersCreateOrUpdateFuture")
+		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lb, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8524,38 +8861,39 @@ func (future LoadBalancersCreateOrUpdateFuture) Result(client LoadBalancersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lb, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LoadBalancersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type LoadBalancersDeleteFuture struct {
+// LoadBalancersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type LoadBalancersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar autorest.Response, err error) {
+func (future LoadBalancersGroupDeleteFuture) Result(client LoadBalancersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8572,45 +8910,39 @@ func (future LoadBalancersDeleteFuture) Result(client LoadBalancersClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LoadBalancerSku SKU of a load balancer
-type LoadBalancerSku struct {
-	// Name - Name of a load balancer SKU. Possible values include: 'LoadBalancerSkuNameBasic', 'LoadBalancerSkuNameStandard'
-	Name LoadBalancerSkuName `json:"name,omitempty"`
-}
-
-// LoadBalancersUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// LoadBalancersGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type LoadBalancersUpdateTagsFuture struct {
+type LoadBalancersGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LoadBalancersUpdateTagsFuture) Result(client LoadBalancersClient) (lb LoadBalancer, err error) {
+func (future LoadBalancersGroupUpdateTagsFuture) Result(client LoadBalancersGroupClient) (lb LoadBalancer, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersUpdateTagsFuture")
+		return lb, azure.NewAsyncOpIncompleteError("network.LoadBalancersGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lb, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -8627,16 +8959,22 @@ func (future LoadBalancersUpdateTagsFuture) Result(client LoadBalancersClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lb, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LoadBalancersUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LoadBalancersGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// LoadBalancerSku SKU of a load balancer
+type LoadBalancerSku struct {
+	// Name - Name of a load balancer SKU. Possible values include: 'LoadBalancerSkuNameBasic', 'LoadBalancerSkuNameStandard'
+	Name LoadBalancerSkuName `json:"name,omitempty"`
+}
+
 // LoadBalancingRule a load balancing rule for a load balancer.
 type LoadBalancingRule struct {
 	autorest.Response `json:"-"`
@@ -8967,29 +9305,29 @@ type LocalNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// LocalNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// LocalNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type LocalNetworkGatewaysCreateOrUpdateFuture struct {
+type LocalNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) {
+func (future LocalNetworkGatewaysGroupCreateOrUpdateFuture) Result(client LocalNetworkGatewaysGroupClient) (lng LocalNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysCreateOrUpdateFuture")
+		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9006,39 +9344,39 @@ func (future LocalNetworkGatewaysCreateOrUpdateFuture) Result(client LocalNetwor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LocalNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// LocalNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type LocalNetworkGatewaysDeleteFuture struct {
+type LocalNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future LocalNetworkGatewaysGroupDeleteFuture) Result(client LocalNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9055,39 +9393,39 @@ func (future LocalNetworkGatewaysDeleteFuture) Result(client LocalNetworkGateway
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// LocalNetworkGatewaysUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type LocalNetworkGatewaysUpdateTagsFuture struct {
+// LocalNetworkGatewaysGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type LocalNetworkGatewaysGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future LocalNetworkGatewaysUpdateTagsFuture) Result(client LocalNetworkGatewaysClient) (lng LocalNetworkGateway, err error) {
+func (future LocalNetworkGatewaysGroupUpdateTagsFuture) Result(client LocalNetworkGatewaysGroupClient) (lng LocalNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysUpdateTagsFuture")
+		return lng, azure.NewAsyncOpIncompleteError("network.LocalNetworkGatewaysGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		lng, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9104,12 +9442,12 @@ func (future LocalNetworkGatewaysUpdateTagsFuture) Result(client LocalNetworkGat
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	lng, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.LocalNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -9605,28 +9943,29 @@ type PacketCaptureResultProperties struct {
 	Filters            *[]PacketCaptureFilter        `json:"filters,omitempty"`
 }
 
-// PacketCapturesCreateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesCreateFuture struct {
+// PacketCapturesGroupCreateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupCreateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pcr PacketCaptureResult, err error) {
+func (future PacketCapturesGroupCreateFuture) Result(client PacketCapturesGroupClient) (pcr PacketCaptureResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesCreateFuture")
+		return pcr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupCreateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcr, err = client.CreateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9643,38 +9982,39 @@ func (future PacketCapturesCreateFuture) Result(client PacketCapturesClient) (pc
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcr, err = client.CreateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesCreateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupCreateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesDeleteFuture struct {
+// PacketCapturesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupDeleteFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9691,39 +10031,39 @@ func (future PacketCapturesDeleteFuture) Result(client PacketCapturesClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// PacketCapturesGroupGetStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PacketCapturesGetStatusFuture struct {
+type PacketCapturesGroupGetStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
+func (future PacketCapturesGroupGetStatusFuture) Result(client PacketCapturesGroupClient) (pcqsr PacketCaptureQueryStatusResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGetStatusFuture")
+		return pcqsr, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupGetStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pcqsr, err = client.GetStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9740,38 +10080,39 @@ func (future PacketCapturesGetStatusFuture) Result(client PacketCapturesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pcqsr, err = client.GetStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesGetStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupGetStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PacketCapturesStopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type PacketCapturesStopFuture struct {
+// PacketCapturesGroupStopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type PacketCapturesGroupStopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar autorest.Response, err error) {
+func (future PacketCapturesGroupStopFuture) Result(client PacketCapturesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesStopFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PacketCapturesGroupStopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.StopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -9788,12 +10129,12 @@ func (future PacketCapturesStopFuture) Result(client PacketCapturesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.StopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesStopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupStopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -10222,29 +10563,29 @@ type PublicIPAddressDNSSettings struct {
 	ReverseFqdn *string `json:"reverseFqdn,omitempty"`
 }
 
-// PublicIPAddressesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type PublicIPAddressesCreateOrUpdateFuture struct {
+// PublicIPAddressesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type PublicIPAddressesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) {
+func (future PublicIPAddressesGroupCreateOrUpdateFuture) Result(client PublicIPAddressesGroupClient) (pia PublicIPAddress, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesCreateOrUpdateFuture")
+		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pia, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10261,39 +10602,39 @@ func (future PublicIPAddressesCreateOrUpdateFuture) Result(client PublicIPAddres
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pia, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PublicIPAddressesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// PublicIPAddressesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type PublicIPAddressesDeleteFuture struct {
+type PublicIPAddressesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClient) (ar autorest.Response, err error) {
+func (future PublicIPAddressesGroupDeleteFuture) Result(client PublicIPAddressesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10310,39 +10651,39 @@ func (future PublicIPAddressesDeleteFuture) Result(client PublicIPAddressesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// PublicIPAddressesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type PublicIPAddressesUpdateTagsFuture struct {
+// PublicIPAddressesGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type PublicIPAddressesGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future PublicIPAddressesUpdateTagsFuture) Result(client PublicIPAddressesClient) (pia PublicIPAddress, err error) {
+func (future PublicIPAddressesGroupUpdateTagsFuture) Result(client PublicIPAddressesGroupClient) (pia PublicIPAddress, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesUpdateTagsFuture")
+		return pia, azure.NewAsyncOpIncompleteError("network.PublicIPAddressesGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		pia, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -10359,12 +10700,12 @@ func (future PublicIPAddressesUpdateTagsFuture) Result(client PublicIPAddressesC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	pia, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11108,29 +11449,29 @@ type RouteFilterRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteFilterRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type RouteFilterRulesCreateOrUpdateFuture struct {
+// RouteFilterRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type RouteFilterRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupCreateOrUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesCreateOrUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11147,39 +11488,39 @@ func (future RouteFilterRulesCreateOrUpdateFuture) Result(client RouteFilterRule
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesDeleteFuture struct {
+type RouteFilterRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient) (ar autorest.Response, err error) {
+func (future RouteFilterRulesGroupDeleteFuture) Result(client RouteFilterRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11196,39 +11537,39 @@ func (future RouteFilterRulesDeleteFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFilterRulesUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFilterRulesGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFilterRulesUpdateFuture struct {
+type RouteFilterRulesGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient) (rfr RouteFilterRule, err error) {
+func (future RouteFilterRulesGroupUpdateFuture) Result(client RouteFilterRulesGroupClient) (rfr RouteFilterRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesUpdateFuture")
+		return rfr, azure.NewAsyncOpIncompleteError("network.RouteFilterRulesGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rfr, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11245,39 +11586,39 @@ func (future RouteFilterRulesUpdateFuture) Result(client RouteFilterRulesClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rfr, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteFiltersGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteFiltersCreateOrUpdateFuture struct {
+type RouteFiltersGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupCreateOrUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersCreateOrUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11294,38 +11635,39 @@ func (future RouteFiltersCreateOrUpdateFuture) Result(client RouteFiltersClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersDeleteFuture struct {
+// RouteFiltersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar autorest.Response, err error) {
+func (future RouteFiltersGroupDeleteFuture) Result(client RouteFiltersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11342,38 +11684,39 @@ func (future RouteFiltersDeleteFuture) Result(client RouteFiltersClient) (ar aut
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteFiltersUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteFiltersUpdateFuture struct {
+// RouteFiltersGroupUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteFiltersGroupUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf RouteFilter, err error) {
+func (future RouteFiltersGroupUpdateFuture) Result(client RouteFiltersGroupClient) (rf RouteFilter, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersUpdateFuture")
+		return rf, azure.NewAsyncOpIncompleteError("network.RouteFiltersGroupUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rf, err = client.UpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11390,12 +11733,12 @@ func (future RouteFiltersUpdateFuture) Result(client RouteFiltersClient) (rf Rou
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rf, err = client.UpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11514,28 +11857,29 @@ type RoutePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RoutesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesCreateOrUpdateFuture struct {
+// RoutesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RoutesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, err error) {
+func (future RoutesGroupCreateOrUpdateFuture) Result(client RoutesGroupClient) (r Route, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return r, azure.NewAsyncOpIncompleteError("network.RoutesCreateOrUpdateFuture")
+		return r, azure.NewAsyncOpIncompleteError("network.RoutesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		r, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11552,38 +11896,38 @@ func (future RoutesCreateOrUpdateFuture) Result(client RoutesClient) (r Route, e
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	r, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RoutesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RoutesDeleteFuture struct {
+// RoutesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type RoutesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Response, err error) {
+func (future RoutesGroupDeleteFuture) Result(client RoutesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RoutesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RoutesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11600,12 +11944,12 @@ func (future RoutesDeleteFuture) Result(client RoutesClient) (ar autorest.Respon
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -11848,29 +12192,29 @@ type RouteTablePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// RouteTablesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteTablesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteTablesCreateOrUpdateFuture struct {
+type RouteTablesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (rt RouteTable, err error) {
+func (future RouteTablesGroupCreateOrUpdateFuture) Result(client RouteTablesGroupClient) (rt RouteTable, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesCreateOrUpdateFuture")
+		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rt, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11887,38 +12231,39 @@ func (future RouteTablesCreateOrUpdateFuture) Result(client RouteTablesClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rt, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteTablesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type RouteTablesDeleteFuture struct {
+// RouteTablesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type RouteTablesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autorest.Response, err error) {
+func (future RouteTablesGroupDeleteFuture) Result(client RouteTablesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11935,39 +12280,39 @@ func (future RouteTablesDeleteFuture) Result(client RouteTablesClient) (ar autor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// RouteTablesUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// RouteTablesGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type RouteTablesUpdateTagsFuture struct {
+type RouteTablesGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future RouteTablesUpdateTagsFuture) Result(client RouteTablesClient) (rt RouteTable, err error) {
+func (future RouteTablesGroupUpdateTagsFuture) Result(client RouteTablesGroupClient) (rt RouteTable, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesUpdateTagsFuture")
+		return rt, azure.NewAsyncOpIncompleteError("network.RouteTablesGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		rt, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -11984,12 +12329,12 @@ func (future RouteTablesUpdateTagsFuture) Result(client RouteTablesClient) (rt R
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	rt, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12243,29 +12588,29 @@ type SecurityGroupPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityGroupsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityGroupsCreateOrUpdateFuture struct {
+// SecurityGroupsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityGroupsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) {
+func (future SecurityGroupsGroupCreateOrUpdateFuture) Result(client SecurityGroupsGroupClient) (sg SecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsCreateOrUpdateFuture")
+		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sg, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12282,38 +12627,39 @@ func (future SecurityGroupsCreateOrUpdateFuture) Result(client SecurityGroupsCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sg, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityGroupsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityGroupsDeleteFuture struct {
+// SecurityGroupsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityGroupsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar autorest.Response, err error) {
+func (future SecurityGroupsGroupDeleteFuture) Result(client SecurityGroupsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12330,39 +12676,39 @@ func (future SecurityGroupsDeleteFuture) Result(client SecurityGroupsClient) (ar
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityGroupsUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// SecurityGroupsGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type SecurityGroupsUpdateTagsFuture struct {
+type SecurityGroupsGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityGroupsUpdateTagsFuture) Result(client SecurityGroupsClient) (sg SecurityGroup, err error) {
+func (future SecurityGroupsGroupUpdateTagsFuture) Result(client SecurityGroupsGroupClient) (sg SecurityGroup, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsUpdateTagsFuture")
+		return sg, azure.NewAsyncOpIncompleteError("network.SecurityGroupsGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sg, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12379,12 +12725,12 @@ func (future SecurityGroupsUpdateTagsFuture) Result(client SecurityGroupsClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sg, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12615,29 +12961,29 @@ type SecurityRulePropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SecurityRulesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type SecurityRulesCreateOrUpdateFuture struct {
+// SecurityRulesGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type SecurityRulesGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClient) (sr SecurityRule, err error) {
+func (future SecurityRulesGroupCreateOrUpdateFuture) Result(client SecurityRulesGroupClient) (sr SecurityRule, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesCreateOrUpdateFuture")
+		return sr, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sr, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12654,38 +13000,39 @@ func (future SecurityRulesCreateOrUpdateFuture) Result(client SecurityRulesClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sr, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SecurityRulesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SecurityRulesDeleteFuture struct {
+// SecurityRulesGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type SecurityRulesGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar autorest.Response, err error) {
+func (future SecurityRulesGroupDeleteFuture) Result(client SecurityRulesGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SecurityRulesGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12702,12 +13049,12 @@ func (future SecurityRulesDeleteFuture) Result(client SecurityRulesClient) (ar a
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -12920,29 +13267,29 @@ type SubnetPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// SubnetsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
+// SubnetsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type SubnetsCreateOrUpdateFuture struct {
+type SubnetsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet, err error) {
+func (future SubnetsGroupCreateOrUpdateFuture) Result(client SubnetsGroupClient) (s Subnet, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.SubnetsCreateOrUpdateFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.SubnetsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -12959,38 +13306,38 @@ func (future SubnetsCreateOrUpdateFuture) Result(client SubnetsClient) (s Subnet
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// SubnetsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type SubnetsDeleteFuture struct {
+// SubnetsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type SubnetsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Response, err error) {
+func (future SubnetsGroupDeleteFuture) Result(client SubnetsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.SubnetsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -13007,12 +13354,12 @@ func (future SubnetsDeleteFuture) Result(client SubnetsClient) (ar autorest.Resp
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -14017,29 +14364,29 @@ type VirtualNetworkGatewayConnectionPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewayConnectionsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsCreateOrUpdateFuture struct {
+// VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngc VirtualNetworkGatewayConnection, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (vngc VirtualNetworkGatewayConnection, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture")
+		return vngc, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vngc, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14056,39 +14403,39 @@ func (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vngc, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsDeleteFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewayConnectionsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewayConnectionsDeleteFuture struct {
+type VirtualNetworkGatewayConnectionsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client VirtualNetworkGatewayConnectionsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupDeleteFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14105,39 +14452,39 @@ func (future VirtualNetworkGatewayConnectionsDeleteFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsResetSharedKeyFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewayConnectionsResetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (crsk ConnectionResetSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (crsk ConnectionResetSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture")
+		return crsk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		crsk, err = client.ResetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14154,39 +14501,39 @@ func (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	crsk, err = client.ResetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsResetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsSetSharedKeyFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewayConnectionsSetSharedKeyFuture struct {
+// VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsClient) (csk ConnectionSharedKey, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (csk ConnectionSharedKey, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture")
+		return csk, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		csk, err = client.SetSharedKeyResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14203,39 +14550,39 @@ func (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture) Result(client V
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	csk, err = client.SetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsSetSharedKeyFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewayConnectionsUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewayConnectionsUpdateTagsFuture struct {
+// VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results
+// of a long-running operation.
+type VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewayConnectionsUpdateTagsFuture) Result(client VirtualNetworkGatewayConnectionsClient) (vngcle VirtualNetworkGatewayConnectionListEntity, err error) {
+func (future VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture) Result(client VirtualNetworkGatewayConnectionsGroupClient) (vngcle VirtualNetworkGatewayConnectionListEntity, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vngcle, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsUpdateTagsFuture")
+		return vngcle, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vngcle, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14252,12 +14599,12 @@ func (future VirtualNetworkGatewayConnectionsUpdateTagsFuture) Result(client Vir
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vngcle, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -14570,29 +14917,29 @@ type VirtualNetworkGatewayPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkGatewaysCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysCreateOrUpdateFuture struct {
+type VirtualNetworkGatewaysGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysCreateOrUpdateFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14609,39 +14956,39 @@ func (future VirtualNetworkGatewaysCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysDeleteFuture struct {
+// VirtualNetworkGatewaysGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGatewaysClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkGatewaysGroupDeleteFuture) Result(client VirtualNetworkGatewaysGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14658,39 +15005,39 @@ func (future VirtualNetworkGatewaysDeleteFuture) Result(client VirtualNetworkGat
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewaysGeneratevpnclientpackageFuture struct {
+// VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GeneratevpnclientpackageResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14707,39 +15054,39 @@ func (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GeneratevpnclientpackageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGenerateVpnProfileFuture struct {
+// VirtualNetworkGatewaysGroupGenerateVpnProfileFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGenerateVpnProfileFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGenerateVpnProfileFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GenerateVpnProfileResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14756,39 +15103,39 @@ func (future VirtualNetworkGatewaysGenerateVpnProfileFuture) Result(client Virtu
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GenerateVpnProfileResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGenerateVpnProfileFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of a
-// long-running operation.
-type VirtualNetworkGatewaysGetAdvertisedRoutesFuture struct {
+// VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture an abstraction for monitoring and retrieving the results of
+// a long-running operation.
+type VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetAdvertisedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14805,39 +15152,39 @@ func (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture) Result(client Virt
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetAdvertisedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetBgpPeerStatusFuture struct {
+type VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysClient) (bpslr BgpPeerStatusListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture) Result(client VirtualNetworkGatewaysGroupClient) (bpslr BgpPeerStatusListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetBgpPeerStatusFuture")
+		return bpslr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		bpslr, err = client.GetBgpPeerStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14854,39 +15201,39 @@ func (future VirtualNetworkGatewaysGetBgpPeerStatusFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	bpslr, err = client.GetBgpPeerStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupGetLearnedRoutesFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysGetLearnedRoutesFuture struct {
+type VirtualNetworkGatewaysGroupGetLearnedRoutesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysClient) (grlr GatewayRouteListResult, err error) {
+func (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture) Result(client VirtualNetworkGatewaysGroupClient) (grlr GatewayRouteListResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetLearnedRoutesFuture")
+		return grlr, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		grlr, err = client.GetLearnedRoutesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14903,39 +15250,39 @@ func (future VirtualNetworkGatewaysGetLearnedRoutesFuture) Result(client Virtual
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	grlr, err = client.GetLearnedRoutesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetLearnedRoutesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysGetVpnProfilePackageURLFuture an abstraction for monitoring and retrieving the results of
-// a long-running operation.
-type VirtualNetworkGatewaysGetVpnProfilePackageURLFuture struct {
+// VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture an abstraction for monitoring and retrieving the
+// results of a long-running operation.
+type VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysClient) (s String, err error) {
+func (future VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture) Result(client VirtualNetworkGatewaysGroupClient) (s String, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture")
+		return s, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		s, err = client.GetVpnProfilePackageURLResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -14952,49 +15299,39 @@ func (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture) Result(client
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	s, err = client.GetVpnProfilePackageURLResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGetVpnProfilePackageURLFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
-type VirtualNetworkGatewaySku struct {
-	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
-	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
-	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
-	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
-	// Capacity - The capacity.
-	Capacity *int32 `json:"capacity,omitempty"`
-}
-
-// VirtualNetworkGatewaysResetFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkGatewaysResetFuture struct {
+// VirtualNetworkGatewaysGroupResetFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkGatewaysGroupResetFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupResetFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysResetFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupResetFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.ResetResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15011,39 +15348,39 @@ func (future VirtualNetworkGatewaysResetFuture) Result(client VirtualNetworkGate
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.ResetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysResetFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupResetFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkGatewaysUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkGatewaysGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkGatewaysUpdateTagsFuture struct {
+type VirtualNetworkGatewaysGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkGatewaysUpdateTagsFuture) Result(client VirtualNetworkGatewaysClient) (vng VirtualNetworkGateway, err error) {
+func (future VirtualNetworkGatewaysGroupUpdateTagsFuture) Result(client VirtualNetworkGatewaysGroupClient) (vng VirtualNetworkGateway, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysUpdateTagsFuture")
+		return vng, azure.NewAsyncOpIncompleteError("network.VirtualNetworkGatewaysGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vng, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15060,16 +15397,26 @@ func (future VirtualNetworkGatewaysUpdateTagsFuture) Result(client VirtualNetwor
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vng, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
+// VirtualNetworkGatewaySku virtualNetworkGatewaySku details
+type VirtualNetworkGatewaySku struct {
+	// Name - Gateway SKU name. Possible values include: 'VirtualNetworkGatewaySkuNameBasic', 'VirtualNetworkGatewaySkuNameHighPerformance', 'VirtualNetworkGatewaySkuNameStandard', 'VirtualNetworkGatewaySkuNameUltraPerformance', 'VirtualNetworkGatewaySkuNameVpnGw1', 'VirtualNetworkGatewaySkuNameVpnGw2', 'VirtualNetworkGatewaySkuNameVpnGw3'
+	Name VirtualNetworkGatewaySkuName `json:"name,omitempty"`
+	// Tier - Gateway SKU tier. Possible values include: 'VirtualNetworkGatewaySkuTierBasic', 'VirtualNetworkGatewaySkuTierHighPerformance', 'VirtualNetworkGatewaySkuTierStandard', 'VirtualNetworkGatewaySkuTierUltraPerformance', 'VirtualNetworkGatewaySkuTierVpnGw1', 'VirtualNetworkGatewaySkuTierVpnGw2', 'VirtualNetworkGatewaySkuTierVpnGw3'
+	Tier VirtualNetworkGatewaySkuTier `json:"tier,omitempty"`
+	// Capacity - The capacity.
+	Capacity *int32 `json:"capacity,omitempty"`
+}
+
 // VirtualNetworkListResult response for the ListVirtualNetworks API service call.
 type VirtualNetworkListResult struct {
 	autorest.Response `json:"-"`
@@ -15461,29 +15808,29 @@ type VirtualNetworkPeeringPropertiesFormat struct {
 	ProvisioningState *string `json:"provisioningState,omitempty"`
 }
 
-// VirtualNetworkPeeringsCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// VirtualNetworkPeeringsGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type VirtualNetworkPeeringsCreateOrUpdateFuture struct {
+type VirtualNetworkPeeringsGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsClient) (vnp VirtualNetworkPeering, err error) {
+func (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture) Result(client VirtualNetworkPeeringsGroupClient) (vnp VirtualNetworkPeering, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsCreateOrUpdateFuture")
+		return vnp, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vnp, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15500,39 +15847,39 @@ func (future VirtualNetworkPeeringsCreateOrUpdateFuture) Result(client VirtualNe
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vnp, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworkPeeringsDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworkPeeringsDeleteFuture struct {
+// VirtualNetworkPeeringsGroupDeleteFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworkPeeringsGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPeeringsClient) (ar autorest.Response, err error) {
+func (future VirtualNetworkPeeringsGroupDeleteFuture) Result(client VirtualNetworkPeeringsGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworkPeeringsGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15549,12 +15896,12 @@ func (future VirtualNetworkPeeringsDeleteFuture) Result(client VirtualNetworkPee
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -15579,29 +15926,29 @@ type VirtualNetworkPropertiesFormat struct {
 	EnableVMProtection *bool `json:"enableVmProtection,omitempty"`
 }
 
-// VirtualNetworksCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type VirtualNetworksCreateOrUpdateFuture struct {
+// VirtualNetworksGroupCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type VirtualNetworksGroupCreateOrUpdateFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) {
+func (future VirtualNetworksGroupCreateOrUpdateFuture) Result(client VirtualNetworksGroupClient) (vn VirtualNetwork, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksCreateOrUpdateFuture")
+		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupCreateOrUpdateFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vn, err = client.CreateOrUpdateResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15618,39 +15965,39 @@ func (future VirtualNetworksCreateOrUpdateFuture) Result(client VirtualNetworksC
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vn, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupCreateOrUpdateFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworksDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
+// VirtualNetworksGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type VirtualNetworksDeleteFuture struct {
+type VirtualNetworksGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (ar autorest.Response, err error) {
+func (future VirtualNetworksGroupDeleteFuture) Result(client VirtualNetworksGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15667,39 +16014,39 @@ func (future VirtualNetworksDeleteFuture) Result(client VirtualNetworksClient) (
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// VirtualNetworksUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
+// VirtualNetworksGroupUpdateTagsFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type VirtualNetworksUpdateTagsFuture struct {
+type VirtualNetworksGroupUpdateTagsFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future VirtualNetworksUpdateTagsFuture) Result(client VirtualNetworksClient) (vn VirtualNetwork, err error) {
+func (future VirtualNetworksGroupUpdateTagsFuture) Result(client VirtualNetworksGroupClient) (vn VirtualNetwork, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksUpdateTagsFuture")
+		return vn, azure.NewAsyncOpIncompleteError("network.VirtualNetworksGroupUpdateTagsFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vn, err = client.UpdateTagsResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -15716,12 +16063,12 @@ func (future VirtualNetworksUpdateTagsFuture) Result(client VirtualNetworksClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vn, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksUpdateTagsFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupUpdateTagsFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
@@ -16064,29 +16411,29 @@ type WatcherPropertiesFormat struct {
 	ProvisioningState ProvisioningState `json:"provisioningState,omitempty"`
 }
 
-// WatchersCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupCheckConnectivityFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersCheckConnectivityFuture struct {
+type WatchersGroupCheckConnectivityFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci ConnectivityInformation, err error) {
+func (future WatchersGroupCheckConnectivityFuture) Result(client WatchersGroupClient) (ci ConnectivityInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ci, azure.NewAsyncOpIncompleteError("network.WatchersCheckConnectivityFuture")
+		return ci, azure.NewAsyncOpIncompleteError("network.WatchersGroupCheckConnectivityFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ci, err = client.CheckConnectivityResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16103,38 +16450,38 @@ func (future WatchersCheckConnectivityFuture) Result(client WatchersClient) (ci
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ci, err = client.CheckConnectivityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersCheckConnectivityFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupCheckConnectivityFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersDeleteFuture struct {
+// WatchersGroupDeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation.
+type WatchersGroupDeleteFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Response, err error) {
+func (future WatchersGroupDeleteFuture) Result(client WatchersGroupClient) (ar autorest.Response, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return ar, azure.NewAsyncOpIncompleteError("network.WatchersDeleteFuture")
+		return ar, azure.NewAsyncOpIncompleteError("network.WatchersGroupDeleteFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		ar, err = client.DeleteResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16151,39 +16498,39 @@ func (future WatchersDeleteFuture) Result(client WatchersClient) (ar autorest.Re
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	ar, err = client.DeleteResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersDeleteFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupDeleteFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetAzureReachabilityReportFuture an abstraction for monitoring and retrieving the results of a
+// WatchersGroupGetAzureReachabilityReportFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type WatchersGetAzureReachabilityReportFuture struct {
+type WatchersGroupGetAzureReachabilityReportFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetAzureReachabilityReportFuture) Result(client WatchersClient) (arr AzureReachabilityReport, err error) {
+func (future WatchersGroupGetAzureReachabilityReportFuture) Result(client WatchersGroupClient) (arr AzureReachabilityReport, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return arr, azure.NewAsyncOpIncompleteError("network.WatchersGetAzureReachabilityReportFuture")
+		return arr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetAzureReachabilityReportFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		arr, err = client.GetAzureReachabilityReportResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16200,39 +16547,39 @@ func (future WatchersGetAzureReachabilityReportFuture) Result(client WatchersCli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	arr, err = client.GetAzureReachabilityReportResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetAzureReachabilityReportFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetAzureReachabilityReportFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetFlowLogStatusFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetFlowLogStatusFuture struct {
+type WatchersGroupGetFlowLogStatusFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupGetFlowLogStatusFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGetFlowLogStatusFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetFlowLogStatusFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.GetFlowLogStatusResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16249,38 +16596,39 @@ func (future WatchersGetFlowLogStatusFuture) Result(client WatchersClient) (fli
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.GetFlowLogStatusResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetFlowLogStatusFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersGetNextHopFuture struct {
+// WatchersGroupGetNextHopFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupGetNextHopFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHopResult, err error) {
+func (future WatchersGroupGetNextHopFuture) Result(client WatchersGroupClient) (nhr NextHopResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGetNextHopFuture")
+		return nhr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetNextHopFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		nhr, err = client.GetNextHopResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16297,39 +16645,39 @@ func (future WatchersGetNextHopFuture) Result(client WatchersClient) (nhr NextHo
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	nhr, err = client.GetNextHopResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetNextHopFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetNextHopFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetTroubleshootingFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetTroubleshootingFuture struct {
+type WatchersGroupGetTroubleshootingFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16346,39 +16694,39 @@ func (future WatchersGetTroubleshootingFuture) Result(client WatchersClient) (tr
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
+// WatchersGroupGetTroubleshootingResultFuture an abstraction for monitoring and retrieving the results of a
 // long-running operation.
-type WatchersGetTroubleshootingResultFuture struct {
+type WatchersGroupGetTroubleshootingResultFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClient) (tr TroubleshootingResult, err error) {
+func (future WatchersGroupGetTroubleshootingResultFuture) Result(client WatchersGroupClient) (tr TroubleshootingResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGetTroubleshootingResultFuture")
+		return tr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetTroubleshootingResultFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		tr, err = client.GetTroubleshootingResultResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16395,39 +16743,39 @@ func (future WatchersGetTroubleshootingResultFuture) Result(client WatchersClien
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	tr, err = client.GetTroubleshootingResultResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetTroubleshootingResultFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
+// WatchersGroupGetVMSecurityRulesFuture an abstraction for monitoring and retrieving the results of a long-running
 // operation.
-type WatchersGetVMSecurityRulesFuture struct {
+type WatchersGroupGetVMSecurityRulesFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sgvr SecurityGroupViewResult, err error) {
+func (future WatchersGroupGetVMSecurityRulesFuture) Result(client WatchersGroupClient) (sgvr SecurityGroupViewResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGetVMSecurityRulesFuture")
+		return sgvr, azure.NewAsyncOpIncompleteError("network.WatchersGroupGetVMSecurityRulesFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		sgvr, err = client.GetVMSecurityRulesResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16444,39 +16792,39 @@ func (future WatchersGetVMSecurityRulesFuture) Result(client WatchersClient) (sg
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	sgvr, err = client.GetVMSecurityRulesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupGetVMSecurityRulesFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersListAvailableProvidersFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type WatchersListAvailableProvidersFuture struct {
+// WatchersGroupListAvailableProvidersFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type WatchersGroupListAvailableProvidersFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersListAvailableProvidersFuture) Result(client WatchersClient) (apl AvailableProvidersList, err error) {
+func (future WatchersGroupListAvailableProvidersFuture) Result(client WatchersGroupClient) (apl AvailableProvidersList, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return apl, azure.NewAsyncOpIncompleteError("network.WatchersListAvailableProvidersFuture")
+		return apl, azure.NewAsyncOpIncompleteError("network.WatchersGroupListAvailableProvidersFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		apl, err = client.ListAvailableProvidersResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16493,39 +16841,39 @@ func (future WatchersListAvailableProvidersFuture) Result(client WatchersClient)
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	apl, err = client.ListAvailableProvidersResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersListAvailableProvidersFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupListAvailableProvidersFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a long-running
-// operation.
-type WatchersSetFlowLogConfigurationFuture struct {
+// WatchersGroupSetFlowLogConfigurationFuture an abstraction for monitoring and retrieving the results of a
+// long-running operation.
+type WatchersGroupSetFlowLogConfigurationFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient) (fli FlowLogInformation, err error) {
+func (future WatchersGroupSetFlowLogConfigurationFuture) Result(client WatchersGroupClient) (fli FlowLogInformation, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return fli, azure.NewAsyncOpIncompleteError("network.WatchersSetFlowLogConfigurationFuture")
+		return fli, azure.NewAsyncOpIncompleteError("network.WatchersGroupSetFlowLogConfigurationFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		fli, err = client.SetFlowLogConfigurationResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16542,38 +16890,39 @@ func (future WatchersSetFlowLogConfigurationFuture) Result(client WatchersClient
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	fli, err = client.SetFlowLogConfigurationResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupSetFlowLogConfigurationFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
 
-// WatchersVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running operation.
-type WatchersVerifyIPFlowFuture struct {
+// WatchersGroupVerifyIPFlowFuture an abstraction for monitoring and retrieving the results of a long-running
+// operation.
+type WatchersGroupVerifyIPFlowFuture struct {
 	azure.Future
 	req *http.Request
 }
 
 // Result returns the result of the asynchronous operation.
 // If the operation has not completed it will return an error.
-func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr VerificationIPFlowResult, err error) {
+func (future WatchersGroupVerifyIPFlowFuture) Result(client WatchersGroupClient) (vifr VerificationIPFlowResult, err error) {
 	var done bool
 	done, err = future.Done(client)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Polling failure")
 		return
 	}
 	if !done {
-		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersVerifyIPFlowFuture")
+		return vifr, azure.NewAsyncOpIncompleteError("network.WatchersGroupVerifyIPFlowFuture")
 	}
 	if future.PollingMethod() == azure.PollingLocation {
 		vifr, err = client.VerifyIPFlowResponder(future.Response())
 		if err != nil {
-			err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
+			err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", future.Response(), "Failure responding to request")
 		}
 		return
 	}
@@ -16590,12 +16939,12 @@ func (future WatchersVerifyIPFlowFuture) Result(client WatchersClient) (vifr Ver
 	resp, err = autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure sending request")
 		return
 	}
 	vifr, err = client.VerifyIPFlowResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupVerifyIPFlowFuture", "Result", resp, "Failure responding to request")
 	}
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/operations.go b/services/network/mgmt/2017-11-01/network/operationsgroup.go
similarity index 60%
rename from services/network/mgmt/2017-11-01/network/operations.go
rename to services/network/mgmt/2017-11-01/network/operationsgroup.go
index 535848d510b2..0fd47deb8fe3 100644
--- a/services/network/mgmt/2017-11-01/network/operations.go
+++ b/services/network/mgmt/2017-11-01/network/operationsgroup.go
@@ -24,47 +24,47 @@ import (
 	"net/http"
 )
 
-// OperationsClient is the network Client
-type OperationsClient struct {
+// OperationsGroupClient is the network Client
+type OperationsGroupClient struct {
 	BaseClient
 }
 
-// NewOperationsClient creates an instance of the OperationsClient client.
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return NewOperationsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewOperationsGroupClient creates an instance of the OperationsGroupClient client.
+func NewOperationsGroupClient(subscriptionID string) OperationsGroupClient {
+	return NewOperationsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewOperationsClientWithBaseURI creates an instance of the OperationsClient client.
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return OperationsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewOperationsGroupClientWithBaseURI creates an instance of the OperationsGroupClient client.
+func NewOperationsGroupClientWithBaseURI(baseURI string, subscriptionID string) OperationsGroupClient {
+	return OperationsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List lists all of the available Network Rest API operations.
-func (client OperationsClient) List(ctx context.Context) (result OperationListResultPage, err error) {
+func (client OperationsGroupClient) List(ctx context.Context) (result OperationListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.olr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.olr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client OperationsGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	const APIVersion = "2017-11-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
@@ -80,14 +80,14 @@ func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request,
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client OperationsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client OperationsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client OperationsClient) ListResponder(resp *http.Response) (result OperationListResult, err error) {
+func (client OperationsGroupClient) ListResponder(resp *http.Response) (result OperationListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -99,10 +99,10 @@ func (client OperationsClient) ListResponder(resp *http.Response) (result Operat
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client OperationsClient) listNextResults(lastResults OperationListResult) (result OperationListResult, err error) {
+func (client OperationsGroupClient) listNextResults(lastResults OperationListResult) (result OperationListResult, err error) {
 	req, err := lastResults.operationListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.OperationsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.OperationsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -110,17 +110,17 @@ func (client OperationsClient) listNextResults(lastResults OperationListResult)
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.OperationsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.OperationsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.OperationsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.OperationsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client OperationsClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) {
+func (client OperationsGroupClient) ListComplete(ctx context.Context) (result OperationListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/packetcaptures.go b/services/network/mgmt/2017-11-01/network/packetcapturesgroup.go
similarity index 71%
rename from services/network/mgmt/2017-11-01/network/packetcaptures.go
rename to services/network/mgmt/2017-11-01/network/packetcapturesgroup.go
index d38455f3229e..d86a088df883 100644
--- a/services/network/mgmt/2017-11-01/network/packetcaptures.go
+++ b/services/network/mgmt/2017-11-01/network/packetcapturesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// PacketCapturesClient is the network Client
-type PacketCapturesClient struct {
+// PacketCapturesGroupClient is the network Client
+type PacketCapturesGroupClient struct {
 	BaseClient
 }
 
-// NewPacketCapturesClient creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
-	return NewPacketCapturesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPacketCapturesGroupClient creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClient(subscriptionID string) PacketCapturesGroupClient {
+	return NewPacketCapturesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPacketCapturesClientWithBaseURI creates an instance of the PacketCapturesClient client.
-func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
-	return PacketCapturesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPacketCapturesGroupClientWithBaseURI creates an instance of the PacketCapturesGroupClient client.
+func NewPacketCapturesGroupClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesGroupClient {
+	return PacketCapturesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // Create create and start a packet capture on the specified VM.
@@ -45,25 +45,25 @@ func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) P
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session. parameters is parameters that define the create
 // packet capture operation.
-func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) Create(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (result PacketCapturesGroupCreateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PacketCaptureParameters", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.PacketCaptureParameters.Target", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "parameters.PacketCaptureParameters.StorageLocation", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PacketCapturesClient", "Create", err.Error())
+		return result, validation.NewError("network.PacketCapturesGroupClient", "Create", err.Error())
 	}
 
 	req, err := client.CreatePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Create", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Create", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client PacketCapturesClient) Create(ctx context.Context, resourceGroupName
 }
 
 // CreatePreparer prepares the Create request.
-func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
+func (client PacketCapturesGroupClient) CreatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string, parameters PacketCapture) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -96,7 +96,7 @@ func (client PacketCapturesClient) CreatePreparer(ctx context.Context, resourceG
 
 // CreateSender sends the Create request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) CreateSender(req *http.Request) (future PacketCapturesCreateFuture, err error) {
+func (client PacketCapturesGroupClient) CreateSender(req *http.Request) (future PacketCapturesGroupCreateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PacketCapturesClient) CreateSender(req *http.Request) (future Packe
 
 // CreateResponder handles the response to the Create request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) CreateResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client PacketCapturesClient) CreateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client PacketCapturesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -166,7 +166,7 @@ func (client PacketCapturesClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) DeleteSender(req *http.Request) (future PacketCapturesDeleteFuture, err error) {
+func (client PacketCapturesGroupClient) DeleteSender(req *http.Request) (future PacketCapturesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client PacketCapturesClient) DeleteSender(req *http.Request) (future Packe
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client PacketCapturesClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCaptureResult, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -241,14 +241,14 @@ func (client PacketCapturesClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
+func (client PacketCapturesGroupClient) GetResponder(resp *http.Response) (result PacketCaptureResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -263,16 +263,16 @@ func (client PacketCapturesClient) GetResponder(resp *http.Response) (result Pac
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource. packetCaptureName is the name given to the packet capture session.
-func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupGetStatusFuture, err error) {
 	req, err := client.GetStatusPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "GetStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "GetStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -280,7 +280,7 @@ func (client PacketCapturesClient) GetStatus(ctx context.Context, resourceGroupN
 }
 
 // GetStatusPreparer prepares the GetStatus request.
-func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) GetStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -303,7 +303,7 @@ func (client PacketCapturesClient) GetStatusPreparer(ctx context.Context, resour
 
 // GetStatusSender sends the GetStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future PacketCapturesGetStatusFuture, err error) {
+func (client PacketCapturesGroupClient) GetStatusSender(req *http.Request) (future PacketCapturesGroupGetStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -318,7 +318,7 @@ func (client PacketCapturesClient) GetStatusSender(req *http.Request) (future Pa
 
 // GetStatusResponder handles the response to the GetStatus request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
+func (client PacketCapturesGroupClient) GetStatusResponder(resp *http.Response) (result PacketCaptureQueryStatusResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,30 +333,30 @@ func (client PacketCapturesClient) GetStatusResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the Network Watcher
 // resource.
-func (client PacketCapturesClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) List(ctx context.Context, resourceGroupName string, networkWatcherName string) (result PacketCaptureListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -378,14 +378,14 @@ func (client PacketCapturesClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PacketCapturesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
+func (client PacketCapturesGroupClient) ListResponder(resp *http.Response) (result PacketCaptureListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -400,16 +400,16 @@ func (client PacketCapturesClient) ListResponder(resp *http.Response) (result Pa
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // packetCaptureName is the name of the packet capture session.
-func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) Stop(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (result PacketCapturesGroupStopFuture, err error) {
 	req, err := client.StopPreparer(ctx, resourceGroupName, networkWatcherName, packetCaptureName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.StopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PacketCapturesClient", "Stop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PacketCapturesGroupClient", "Stop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -417,7 +417,7 @@ func (client PacketCapturesClient) Stop(ctx context.Context, resourceGroupName s
 }
 
 // StopPreparer prepares the Stop request.
-func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
+func (client PacketCapturesGroupClient) StopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, packetCaptureName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"packetCaptureName":  autorest.Encode("path", packetCaptureName),
@@ -440,7 +440,7 @@ func (client PacketCapturesClient) StopPreparer(ctx context.Context, resourceGro
 
 // StopSender sends the Stop request. The method will close the
 // http.Response Body if it receives an error.
-func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketCapturesStopFuture, err error) {
+func (client PacketCapturesGroupClient) StopSender(req *http.Request) (future PacketCapturesGroupStopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -455,7 +455,7 @@ func (client PacketCapturesClient) StopSender(req *http.Request) (future PacketC
 
 // StopResponder handles the response to the Stop request. The method always
 // closes the http.Response Body.
-func (client PacketCapturesClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PacketCapturesGroupClient) StopResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/publicipaddresses.go b/services/network/mgmt/2017-11-01/network/publicipaddressesgroup.go
similarity index 70%
rename from services/network/mgmt/2017-11-01/network/publicipaddresses.go
rename to services/network/mgmt/2017-11-01/network/publicipaddressesgroup.go
index 5848589f0af8..ec33762a1033 100644
--- a/services/network/mgmt/2017-11-01/network/publicipaddresses.go
+++ b/services/network/mgmt/2017-11-01/network/publicipaddressesgroup.go
@@ -25,26 +25,26 @@ import (
 	"net/http"
 )
 
-// PublicIPAddressesClient is the network Client
-type PublicIPAddressesClient struct {
+// PublicIPAddressesGroupClient is the network Client
+type PublicIPAddressesGroupClient struct {
 	BaseClient
 }
 
-// NewPublicIPAddressesClient creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
-	return NewPublicIPAddressesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewPublicIPAddressesGroupClient creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClient(subscriptionID string) PublicIPAddressesGroupClient {
+	return NewPublicIPAddressesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewPublicIPAddressesClientWithBaseURI creates an instance of the PublicIPAddressesClient client.
-func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
-	return PublicIPAddressesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewPublicIPAddressesGroupClientWithBaseURI creates an instance of the PublicIPAddressesGroupClient client.
+func NewPublicIPAddressesGroupClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesGroupClient {
+	return PublicIPAddressesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a static or dynamic public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address.
 // parameters is parameters supplied to the create or update public IP address operation.
-func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (result PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat", Name: validation.Null, Rule: false,
@@ -53,18 +53,18 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 						Chain: []validation.Constraint{{Target: "parameters.PublicIPAddressPropertiesFormat.IPConfiguration.IPConfigurationPropertiesFormat.PublicIPAddress", Name: validation.Null, Rule: false, Chain: nil}}},
 					}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.PublicIPAddressesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.PublicIPAddressesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, publicIPAddressName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -72,7 +72,7 @@ func (client PublicIPAddressesClient) CreateOrUpdate(ctx context.Context, resour
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters PublicIPAddress) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -96,7 +96,7 @@ func (client PublicIPAddressesClient) CreateOrUpdatePreparer(ctx context.Context
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateSender(req *http.Request) (future PublicIPAddressesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client PublicIPAddressesClient) CreateOrUpdateSender(req *http.Request) (f
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -125,16 +125,16 @@ func (client PublicIPAddressesClient) CreateOrUpdateResponder(resp *http.Respons
 // Delete deletes the specified public IP address.
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet.
-func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) Delete(ctx context.Context, resourceGroupName string, publicIPAddressName string) (result PublicIPAddressesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, publicIPAddressName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -142,7 +142,7 @@ func (client PublicIPAddressesClient) Delete(ctx context.Context, resourceGroupN
 }
 
 // DeletePreparer prepares the Delete request.
-func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -164,7 +164,7 @@ func (client PublicIPAddressesClient) DeletePreparer(ctx context.Context, resour
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future PublicIPAddressesDeleteFuture, err error) {
+func (client PublicIPAddressesGroupClient) DeleteSender(req *http.Request) (future PublicIPAddressesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -179,7 +179,7 @@ func (client PublicIPAddressesClient) DeleteSender(req *http.Request) (future Pu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client PublicIPAddressesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -193,30 +193,30 @@ func (client PublicIPAddressesClient) DeleteResponder(resp *http.Response) (resu
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the subnet. expand is
 // expands referenced resources.
-func (client PublicIPAddressesClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) Get(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -241,14 +241,14 @@ func (client PublicIPAddressesClient) GetPreparer(ctx context.Context, resourceG
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -265,30 +265,30 @@ func (client PublicIPAddressesClient) GetResponder(resp *http.Response) (result
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the name of the
 // network interface. IPConfigurationName is the name of the IP configuration. publicIPAddressName is the name of
 // the public IP Address. expand is expands referenced resources.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddress(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (result PublicIPAddress, err error) {
 	req, err := client.GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName, publicIPAddressName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetVirtualMachineScaleSetPublicIPAddressSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetVirtualMachineScaleSetPublicIPAddressResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "GetVirtualMachineScaleSetPublicIPAddress", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressPreparer prepares the GetVirtualMachineScaleSetPublicIPAddress request.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string, publicIPAddressName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -317,14 +317,14 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressPr
 
 // GetVirtualMachineScaleSetPublicIPAddressSender sends the GetVirtualMachineScaleSetPublicIPAddress request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetVirtualMachineScaleSetPublicIPAddressResponder handles the response to the GetVirtualMachineScaleSetPublicIPAddress request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) GetVirtualMachineScaleSetPublicIPAddressResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -338,31 +338,31 @@ func (client PublicIPAddressesClient) GetVirtualMachineScaleSetPublicIPAddressRe
 // List gets all public IP addresses in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client PublicIPAddressesClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) List(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -383,14 +383,14 @@ func (client PublicIPAddressesClient) ListPreparer(ctx context.Context, resource
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -402,10 +402,10 @@ func (client PublicIPAddressesClient) ListResponder(resp *http.Response) (result
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -413,47 +413,47 @@ func (client PublicIPAddressesClient) listNextResults(lastResults PublicIPAddres
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all the public IP addresses in a subscription.
-func (client PublicIPAddressesClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListAll(ctx context.Context) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -473,14 +473,14 @@ func (client PublicIPAddressesClient) ListAllPreparer(ctx context.Context) (*htt
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListAllResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -492,10 +492,10 @@ func (client PublicIPAddressesClient) ListAllResponder(resp *http.Response) (res
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listAllNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -503,17 +503,17 @@ func (client PublicIPAddressesClient) listAllNextResults(lastResults PublicIPAdd
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListAllComplete(ctx context.Context) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -523,31 +523,31 @@ func (client PublicIPAddressesClient) ListAllComplete(ctx context.Context) (resu
 //
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":          autorest.Encode("path", resourceGroupName),
 		"subscriptionId":             autorest.Encode("path", client.SubscriptionID),
@@ -569,14 +569,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 
 // ListVirtualMachineScaleSetPublicIPAddressesSender sends the ListVirtualMachineScaleSetPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -588,10 +588,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 }
 
 // listVirtualMachineScaleSetPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -599,17 +599,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetPublicIPAddresse
 	resp, err := client.ListVirtualMachineScaleSetPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName)
 	return
 }
@@ -620,31 +620,31 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetPublicIPAddresse
 // resourceGroupName is the name of the resource group. virtualMachineScaleSetName is the name of the virtual
 // machine scale set. virtualmachineIndex is the virtual machine index. networkInterfaceName is the network
 // interface name. IPConfigurationName is the IP configuration name.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddresses(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultPage, err error) {
 	result.fn = client.listVirtualMachineScaleSetVMPublicIPAddressesNextResults
 	req, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.pialr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure sending request")
 		return
 	}
 
 	result.pialr, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "ListVirtualMachineScaleSetVMPublicIPAddresses", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesPreparer prepares the ListVirtualMachineScaleSetVMPublicIPAddresses request.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesPreparer(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"ipConfigurationName":        autorest.Encode("path", IPConfigurationName),
 		"networkInterfaceName":       autorest.Encode("path", networkInterfaceName),
@@ -669,14 +669,14 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesSender sends the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesResponder handles the response to the ListVirtualMachineScaleSetVMPublicIPAddresses request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp *http.Response) (result PublicIPAddressListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -688,10 +688,10 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 }
 
 // listVirtualMachineScaleSetVMPublicIPAddressesNextResults retrieves the next set of results, if any.
-func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
+func (client PublicIPAddressesGroupClient) listVirtualMachineScaleSetVMPublicIPAddressesNextResults(lastResults PublicIPAddressListResult) (result PublicIPAddressListResult, err error) {
 	req, err := lastResults.publicIPAddressListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -699,17 +699,17 @@ func (client PublicIPAddressesClient) listVirtualMachineScaleSetVMPublicIPAddres
 	resp, err := client.ListVirtualMachineScaleSetVMPublicIPAddressesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListVirtualMachineScaleSetVMPublicIPAddressesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "listVirtualMachineScaleSetVMPublicIPAddressesNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListVirtualMachineScaleSetVMPublicIPAddressesComplete enumerates all values, automatically crossing page boundaries as required.
-func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
+func (client PublicIPAddressesGroupClient) ListVirtualMachineScaleSetVMPublicIPAddressesComplete(ctx context.Context, resourceGroupName string, virtualMachineScaleSetName string, virtualmachineIndex string, networkInterfaceName string, IPConfigurationName string) (result PublicIPAddressListResultIterator, err error) {
 	result.page, err = client.ListVirtualMachineScaleSetVMPublicIPAddresses(ctx, resourceGroupName, virtualMachineScaleSetName, virtualmachineIndex, networkInterfaceName, IPConfigurationName)
 	return
 }
@@ -718,16 +718,16 @@ func (client PublicIPAddressesClient) ListVirtualMachineScaleSetVMPublicIPAddres
 //
 // resourceGroupName is the name of the resource group. publicIPAddressName is the name of the public IP address.
 // parameters is parameters supplied to update public IP address tags.
-func (client PublicIPAddressesClient) UpdateTags(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (result PublicIPAddressesUpdateTagsFuture, err error) {
+func (client PublicIPAddressesGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (result PublicIPAddressesGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, publicIPAddressName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.PublicIPAddressesGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -735,7 +735,7 @@ func (client PublicIPAddressesClient) UpdateTags(ctx context.Context, resourceGr
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client PublicIPAddressesClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (*http.Request, error) {
+func (client PublicIPAddressesGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, publicIPAddressName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"publicIpAddressName": autorest.Encode("path", publicIPAddressName),
 		"resourceGroupName":   autorest.Encode("path", resourceGroupName),
@@ -759,7 +759,7 @@ func (client PublicIPAddressesClient) UpdateTagsPreparer(ctx context.Context, re
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client PublicIPAddressesClient) UpdateTagsSender(req *http.Request) (future PublicIPAddressesUpdateTagsFuture, err error) {
+func (client PublicIPAddressesGroupClient) UpdateTagsSender(req *http.Request) (future PublicIPAddressesGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -774,7 +774,7 @@ func (client PublicIPAddressesClient) UpdateTagsSender(req *http.Request) (futur
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client PublicIPAddressesClient) UpdateTagsResponder(resp *http.Response) (result PublicIPAddress, err error) {
+func (client PublicIPAddressesGroupClient) UpdateTagsResponder(resp *http.Response) (result PublicIPAddress, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/routefilterrules.go b/services/network/mgmt/2017-11-01/network/routefilterrulesgroup.go
similarity index 72%
rename from services/network/mgmt/2017-11-01/network/routefilterrules.go
rename to services/network/mgmt/2017-11-01/network/routefilterrulesgroup.go
index 6e3eba595e3b..5999c7d98517 100644
--- a/services/network/mgmt/2017-11-01/network/routefilterrules.go
+++ b/services/network/mgmt/2017-11-01/network/routefilterrulesgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// RouteFilterRulesClient is the network Client
-type RouteFilterRulesClient struct {
+// RouteFilterRulesGroupClient is the network Client
+type RouteFilterRulesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFilterRulesClient creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClient(subscriptionID string) RouteFilterRulesClient {
-	return NewRouteFilterRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFilterRulesGroupClient creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClient(subscriptionID string) RouteFilterRulesGroupClient {
+	return NewRouteFilterRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFilterRulesClientWithBaseURI creates an instance of the RouteFilterRulesClient client.
-func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesClient {
-	return RouteFilterRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFilterRulesGroupClientWithBaseURI creates an instance of the RouteFilterRulesGroupClient client.
+func NewRouteFilterRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesGroupClient {
+	return RouteFilterRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route filter.
@@ -45,25 +45,25 @@ func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string)
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the create or update
 // route filter rule operation.
-func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (result RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: routeFilterRuleParameters,
 			Constraints: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.RouteFilterRuleType", Name: validation.Null, Rule: true, Chain: nil},
 					{Target: "routeFilterRuleParameters.RouteFilterRulePropertiesFormat.Communities", Name: validation.Null, Rule: true, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.RouteFilterRulesClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.RouteFilterRulesGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -71,7 +71,7 @@ func (client RouteFilterRulesClient) CreateOrUpdate(ctx context.Context, resourc
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters RouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -96,7 +96,7 @@ func (client RouteFilterRulesClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesCreateOrUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFilterRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -111,7 +111,7 @@ func (client RouteFilterRulesClient) CreateOrUpdateSender(req *http.Request) (fu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -126,16 +126,16 @@ func (client RouteFilterRulesClient) CreateOrUpdateResponder(resp *http.Response
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -143,7 +143,7 @@ func (client RouteFilterRulesClient) Delete(ctx context.Context, resourceGroupNa
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -166,7 +166,7 @@ func (client RouteFilterRulesClient) DeletePreparer(ctx context.Context, resourc
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future RouteFilterRulesDeleteFuture, err error) {
+func (client RouteFilterRulesGroupClient) DeleteSender(req *http.Request) (future RouteFilterRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -181,7 +181,7 @@ func (client RouteFilterRulesClient) DeleteSender(req *http.Request) (future Rou
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFilterRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -195,30 +195,30 @@ func (client RouteFilterRulesClient) DeleteResponder(resp *http.Response) (resul
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the rule.
-func (client RouteFilterRulesClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (result RouteFilterRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, ruleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -241,14 +241,14 @@ func (client RouteFilterRulesClient) GetPreparer(ctx context.Context, resourceGr
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) GetResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -262,31 +262,31 @@ func (client RouteFilterRulesClient) GetResponder(resp *http.Response) (result R
 // ListByRouteFilter gets all RouteFilterRules in a route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFilterRulesClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilter(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultPage, err error) {
 	result.fn = client.listByRouteFilterNextResults
 	req, err := client.ListByRouteFilterPreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.rfrlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure sending request")
 		return
 	}
 
 	result.rfrlr, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "ListByRouteFilter", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "ListByRouteFilter", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByRouteFilterPreparer prepares the ListByRouteFilter request.
-func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterPreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -308,14 +308,14 @@ func (client RouteFilterRulesClient) ListByRouteFilterPreparer(ctx context.Conte
 
 // ListByRouteFilterSender sends the ListByRouteFilter request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByRouteFilterResponder handles the response to the ListByRouteFilter request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterResponder(resp *http.Response) (result RouteFilterRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -327,10 +327,10 @@ func (client RouteFilterRulesClient) ListByRouteFilterResponder(resp *http.Respo
 }
 
 // listByRouteFilterNextResults retrieves the next set of results, if any.
-func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
+func (client RouteFilterRulesGroupClient) listByRouteFilterNextResults(lastResults RouteFilterRuleListResult) (result RouteFilterRuleListResult, err error) {
 	req, err := lastResults.routeFilterRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -338,17 +338,17 @@ func (client RouteFilterRulesClient) listByRouteFilterNextResults(lastResults Ro
 	resp, err := client.ListByRouteFilterSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByRouteFilterResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "listByRouteFilterNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByRouteFilterComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
+func (client RouteFilterRulesGroupClient) ListByRouteFilterComplete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFilterRuleListResultIterator, err error) {
 	result.page, err = client.ListByRouteFilter(ctx, resourceGroupName, routeFilterName)
 	return
 }
@@ -358,16 +358,16 @@ func (client RouteFilterRulesClient) ListByRouteFilterComplete(ctx context.Conte
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. ruleName
 // is the name of the route filter rule. routeFilterRuleParameters is parameters supplied to the update route
 // filter rule operation.
-func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (result RouteFilterRulesGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, ruleName, routeFilterRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFilterRulesGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -375,7 +375,7 @@ func (client RouteFilterRulesClient) Update(ctx context.Context, resourceGroupNa
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
+func (client RouteFilterRulesGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, ruleName string, routeFilterRuleParameters PatchRouteFilterRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -400,7 +400,7 @@ func (client RouteFilterRulesClient) UpdatePreparer(ctx context.Context, resourc
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future RouteFilterRulesUpdateFuture, err error) {
+func (client RouteFilterRulesGroupClient) UpdateSender(req *http.Request) (future RouteFilterRulesGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -415,7 +415,7 @@ func (client RouteFilterRulesClient) UpdateSender(req *http.Request) (future Rou
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFilterRulesClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
+func (client RouteFilterRulesGroupClient) UpdateResponder(resp *http.Response) (result RouteFilterRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/routefilters.go b/services/network/mgmt/2017-11-01/network/routefiltersgroup.go
similarity index 66%
rename from services/network/mgmt/2017-11-01/network/routefilters.go
rename to services/network/mgmt/2017-11-01/network/routefiltersgroup.go
index d88ef109bd58..4b6316d115c5 100644
--- a/services/network/mgmt/2017-11-01/network/routefilters.go
+++ b/services/network/mgmt/2017-11-01/network/routefiltersgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteFiltersClient is the network Client
-type RouteFiltersClient struct {
+// RouteFiltersGroupClient is the network Client
+type RouteFiltersGroupClient struct {
 	BaseClient
 }
 
-// NewRouteFiltersClient creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
-	return NewRouteFiltersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteFiltersGroupClient creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClient(subscriptionID string) RouteFiltersGroupClient {
+	return NewRouteFiltersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteFiltersClientWithBaseURI creates an instance of the RouteFiltersClient client.
-func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
-	return RouteFiltersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteFiltersGroupClientWithBaseURI creates an instance of the RouteFiltersGroupClient client.
+func NewRouteFiltersGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersGroupClient {
+	return RouteFiltersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route filter in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the create or update route filter operation.
-func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (result RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteFiltersClient) CreateOrUpdate(ctx context.Context, resourceGro
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters RouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -84,7 +84,7 @@ func (client RouteFiltersClient) CreateOrUpdatePreparer(ctx context.Context, res
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersCreateOrUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteFiltersGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteFiltersClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteFiltersClient) CreateOrUpdateResponder(resp *http.Response) (r
 // Delete deletes the specified route filter.
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
-func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) Delete(ctx context.Context, resourceGroupName string, routeFilterName string) (result RouteFiltersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeFilterName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteFiltersClient) Delete(ctx context.Context, resourceGroupName s
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeFilterName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -152,7 +152,7 @@ func (client RouteFiltersClient) DeletePreparer(ctx context.Context, resourceGro
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFiltersDeleteFuture, err error) {
+func (client RouteFiltersGroupClient) DeleteSender(req *http.Request) (future RouteFiltersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteFiltersClient) DeleteSender(req *http.Request) (future RouteFi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteFiltersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteFiltersClient) DeleteResponder(resp *http.Response) (result au
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter. expand is
 // expands referenced express route bgp peering resources.
-func (client RouteFiltersClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) Get(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (result RouteFilter, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeFilterName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeFilterName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -229,14 +229,14 @@ func (client RouteFiltersClient) GetPreparer(ctx context.Context, resourceGroupN
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) GetResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -248,31 +248,31 @@ func (client RouteFiltersClient) GetResponder(resp *http.Response) (result Route
 }
 
 // List gets all route filters in a subscription.
-func (client RouteFiltersClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) List(ctx context.Context) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -292,14 +292,14 @@ func (client RouteFiltersClient) ListPreparer(ctx context.Context) (*http.Reques
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -311,10 +311,10 @@ func (client RouteFiltersClient) ListResponder(resp *http.Response) (result Rout
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -322,17 +322,17 @@ func (client RouteFiltersClient) listNextResults(lastResults RouteFilterListResu
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListComplete(ctx context.Context) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.List(ctx)
 	return
 }
@@ -340,31 +340,31 @@ func (client RouteFiltersClient) ListComplete(ctx context.Context) (result Route
 // ListByResourceGroup gets all route filters in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteFiltersClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroup(ctx context.Context, resourceGroupName string) (result RouteFilterListResultPage, err error) {
 	result.fn = client.listByResourceGroupNextResults
 	req, err := client.ListByResourceGroupPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.rflr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure sending request")
 		return
 	}
 
 	result.rflr, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "ListByResourceGroup", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "ListByResourceGroup", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListByResourceGroupPreparer prepares the ListByResourceGroup request.
-func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -385,14 +385,14 @@ func (client RouteFiltersClient) ListByResourceGroupPreparer(ctx context.Context
 
 // ListByResourceGroupSender sends the ListByResourceGroup request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListByResourceGroupResponder handles the response to the ListByResourceGroup request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupResponder(resp *http.Response) (result RouteFilterListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteFiltersClient) ListByResourceGroupResponder(resp *http.Respons
 }
 
 // listByResourceGroupNextResults retrieves the next set of results, if any.
-func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
+func (client RouteFiltersGroupClient) listByResourceGroupNextResults(lastResults RouteFilterListResult) (result RouteFilterListResult, err error) {
 	req, err := lastResults.routeFilterListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteFiltersClient) listByResourceGroupNextResults(lastResults Rout
 	resp, err := client.ListByResourceGroupSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListByResourceGroupComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
+func (client RouteFiltersGroupClient) ListByResourceGroupComplete(ctx context.Context, resourceGroupName string) (result RouteFilterListResultIterator, err error) {
 	result.page, err = client.ListByResourceGroup(ctx, resourceGroupName)
 	return
 }
@@ -434,16 +434,16 @@ func (client RouteFiltersClient) ListByResourceGroupComplete(ctx context.Context
 //
 // resourceGroupName is the name of the resource group. routeFilterName is the name of the route filter.
 // routeFilterParameters is parameters supplied to the update route filter operation.
-func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) Update(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (result RouteFiltersGroupUpdateFuture, err error) {
 	req, err := client.UpdatePreparer(ctx, resourceGroupName, routeFilterName, routeFilterParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteFiltersClient", "Update", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteFiltersGroupClient", "Update", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client RouteFiltersClient) Update(ctx context.Context, resourceGroupName s
 }
 
 // UpdatePreparer prepares the Update request.
-func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
+func (client RouteFiltersGroupClient) UpdatePreparer(ctx context.Context, resourceGroupName string, routeFilterName string, routeFilterParameters PatchRouteFilter) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeFilterName":   autorest.Encode("path", routeFilterName),
@@ -475,7 +475,7 @@ func (client RouteFiltersClient) UpdatePreparer(ctx context.Context, resourceGro
 
 // UpdateSender sends the Update request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFiltersUpdateFuture, err error) {
+func (client RouteFiltersGroupClient) UpdateSender(req *http.Request) (future RouteFiltersGroupUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client RouteFiltersClient) UpdateSender(req *http.Request) (future RouteFi
 
 // UpdateResponder handles the response to the Update request. The method always
 // closes the http.Response Body.
-func (client RouteFiltersClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
+func (client RouteFiltersGroupClient) UpdateResponder(resp *http.Response) (result RouteFilter, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/routes.go b/services/network/mgmt/2017-11-01/network/routesgroup.go
similarity index 69%
rename from services/network/mgmt/2017-11-01/network/routes.go
rename to services/network/mgmt/2017-11-01/network/routesgroup.go
index 4cc866f7199d..bec15dfc8799 100644
--- a/services/network/mgmt/2017-11-01/network/routes.go
+++ b/services/network/mgmt/2017-11-01/network/routesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RoutesClient is the network Client
-type RoutesClient struct {
+// RoutesGroupClient is the network Client
+type RoutesGroupClient struct {
 	BaseClient
 }
 
-// NewRoutesClient creates an instance of the RoutesClient client.
-func NewRoutesClient(subscriptionID string) RoutesClient {
-	return NewRoutesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRoutesGroupClient creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClient(subscriptionID string) RoutesGroupClient {
+	return NewRoutesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRoutesClientWithBaseURI creates an instance of the RoutesClient client.
-func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
-	return RoutesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRoutesGroupClientWithBaseURI creates an instance of the RoutesGroupClient client.
+func NewRoutesGroupClientWithBaseURI(baseURI string, subscriptionID string) RoutesGroupClient {
+	return RoutesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a route in the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route. routeParameters is parameters supplied to the create or update route operation.
-func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (result RoutesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, routeName, routeParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RoutesClient) CreateOrUpdate(ctx context.Context, resourceGroupName
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
+func (client RoutesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string, routeParameters Route) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -85,7 +85,7 @@ func (client RoutesClient) CreateOrUpdatePreparer(ctx context.Context, resourceG
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future RoutesCreateOrUpdateFuture, err error) {
+func (client RoutesGroupClient) CreateOrUpdateSender(req *http.Request) (future RoutesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -100,7 +100,7 @@ func (client RoutesClient) CreateOrUpdateSender(req *http.Request) (future Route
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -115,16 +115,16 @@ func (client RoutesClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result RoutesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -132,7 +132,7 @@ func (client RoutesClient) Delete(ctx context.Context, resourceGroupName string,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -155,7 +155,7 @@ func (client RoutesClient) DeletePreparer(ctx context.Context, resourceGroupName
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteFuture, err error) {
+func (client RoutesGroupClient) DeleteSender(req *http.Request) (future RoutesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -170,7 +170,7 @@ func (client RoutesClient) DeleteSender(req *http.Request) (future RoutesDeleteF
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RoutesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -184,30 +184,30 @@ func (client RoutesClient) DeleteResponder(resp *http.Response) (result autorest
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. routeName is
 // the name of the route.
-func (client RoutesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
+func (client RoutesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (result Route, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, routeName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
+func (client RoutesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, routeName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeName":         autorest.Encode("path", routeName),
@@ -230,14 +230,14 @@ func (client RoutesClient) GetPreparer(ctx context.Context, resourceGroupName st
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err error) {
+func (client RoutesGroupClient) GetResponder(resp *http.Response) (result Route, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client RoutesClient) GetResponder(resp *http.Response) (result Route, err
 // List gets all routes in a route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RoutesClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
+func (client RoutesGroupClient) List(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RoutesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -297,14 +297,14 @@ func (client RoutesClient) ListPreparer(ctx context.Context, resourceGroupName s
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RoutesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RoutesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
+func (client RoutesGroupClient) ListResponder(resp *http.Response) (result RouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -316,10 +316,10 @@ func (client RoutesClient) ListResponder(resp *http.Response) (result RouteListR
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RoutesClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
+func (client RoutesGroupClient) listNextResults(lastResults RouteListResult) (result RouteListResult, err error) {
 	req, err := lastResults.routeListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -327,17 +327,17 @@ func (client RoutesClient) listNextResults(lastResults RouteListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RoutesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RoutesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RoutesClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
+func (client RoutesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, routeTableName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/routetables.go b/services/network/mgmt/2017-11-01/network/routetablesgroup.go
similarity index 66%
rename from services/network/mgmt/2017-11-01/network/routetables.go
rename to services/network/mgmt/2017-11-01/network/routetablesgroup.go
index 9f398ed0af3e..95bfec6ae990 100644
--- a/services/network/mgmt/2017-11-01/network/routetables.go
+++ b/services/network/mgmt/2017-11-01/network/routetablesgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// RouteTablesClient is the network Client
-type RouteTablesClient struct {
+// RouteTablesGroupClient is the network Client
+type RouteTablesGroupClient struct {
 	BaseClient
 }
 
-// NewRouteTablesClient creates an instance of the RouteTablesClient client.
-func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
-	return NewRouteTablesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewRouteTablesGroupClient creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClient(subscriptionID string) RouteTablesGroupClient {
+	return NewRouteTablesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewRouteTablesClientWithBaseURI creates an instance of the RouteTablesClient client.
-func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
-	return RouteTablesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewRouteTablesGroupClientWithBaseURI creates an instance of the RouteTablesGroupClient client.
+func NewRouteTablesGroupClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesGroupClient {
+	return RouteTablesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate create or updates a route table in a specified resource group.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters
 // is parameters supplied to the create or update route table operation.
-func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (result RouteTablesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, routeTableName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client RouteTablesClient) CreateOrUpdate(ctx context.Context, resourceGrou
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
+func (client RouteTablesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters RouteTable) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -84,7 +84,7 @@ func (client RouteTablesClient) CreateOrUpdatePreparer(ctx context.Context, reso
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesCreateOrUpdateFuture, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateSender(req *http.Request) (future RouteTablesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client RouteTablesClient) CreateOrUpdateSender(req *http.Request) (future
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client RouteTablesClient) CreateOrUpdateResponder(resp *http.Response) (re
 // Delete deletes the specified route table.
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table.
-func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) Delete(ctx context.Context, resourceGroupName string, routeTableName string) (result RouteTablesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, routeTableName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client RouteTablesClient) Delete(ctx context.Context, resourceGroupName st
 }
 
 // DeletePreparer prepares the Delete request.
-func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, routeTableName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -152,7 +152,7 @@ func (client RouteTablesClient) DeletePreparer(ctx context.Context, resourceGrou
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTablesDeleteFuture, err error) {
+func (client RouteTablesGroupClient) DeleteSender(req *http.Request) (future RouteTablesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -167,7 +167,7 @@ func (client RouteTablesClient) DeleteSender(req *http.Request) (future RouteTab
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client RouteTablesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -181,30 +181,30 @@ func (client RouteTablesClient) DeleteResponder(resp *http.Response) (result aut
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. expand is
 // expands referenced resources.
-func (client RouteTablesClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) Get(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (result RouteTable, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, routeTableName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
+func (client RouteTablesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, routeTableName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -229,14 +229,14 @@ func (client RouteTablesClient) GetPreparer(ctx context.Context, resourceGroupNa
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) GetResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -250,31 +250,31 @@ func (client RouteTablesClient) GetResponder(resp *http.Response) (result RouteT
 // List gets all route tables in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client RouteTablesClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) List(ctx context.Context, resourceGroupName string) (result RouteTableListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -295,14 +295,14 @@ func (client RouteTablesClient) ListPreparer(ctx context.Context, resourceGroupN
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -314,10 +314,10 @@ func (client RouteTablesClient) ListResponder(resp *http.Response) (result Route
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -325,47 +325,47 @@ func (client RouteTablesClient) listNextResults(lastResults RouteTableListResult
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all route tables in a subscription.
-func (client RouteTablesClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
+func (client RouteTablesGroupClient) ListAll(ctx context.Context) (result RouteTableListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.rtlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.rtlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client RouteTablesGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -385,14 +385,14 @@ func (client RouteTablesClient) ListAllPreparer(ctx context.Context) (*http.Requ
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client RouteTablesGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) ListAllResponder(resp *http.Response) (result RouteTableListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -404,10 +404,10 @@ func (client RouteTablesClient) ListAllResponder(resp *http.Response) (result Ro
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
+func (client RouteTablesGroupClient) listAllNextResults(lastResults RouteTableListResult) (result RouteTableListResult, err error) {
 	req, err := lastResults.routeTableListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -415,17 +415,17 @@ func (client RouteTablesClient) listAllNextResults(lastResults RouteTableListRes
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
+func (client RouteTablesGroupClient) ListAllComplete(ctx context.Context) (result RouteTableListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -434,16 +434,16 @@ func (client RouteTablesClient) ListAllComplete(ctx context.Context) (result Rou
 //
 // resourceGroupName is the name of the resource group. routeTableName is the name of the route table. parameters
 // is parameters supplied to update route table tags.
-func (client RouteTablesClient) UpdateTags(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (result RouteTablesUpdateTagsFuture, err error) {
+func (client RouteTablesGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (result RouteTablesGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, routeTableName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.RouteTablesClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.RouteTablesGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -451,7 +451,7 @@ func (client RouteTablesClient) UpdateTags(ctx context.Context, resourceGroupNam
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client RouteTablesClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (*http.Request, error) {
+func (client RouteTablesGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, routeTableName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"routeTableName":    autorest.Encode("path", routeTableName),
@@ -475,7 +475,7 @@ func (client RouteTablesClient) UpdateTagsPreparer(ctx context.Context, resource
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client RouteTablesClient) UpdateTagsSender(req *http.Request) (future RouteTablesUpdateTagsFuture, err error) {
+func (client RouteTablesGroupClient) UpdateTagsSender(req *http.Request) (future RouteTablesGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -490,7 +490,7 @@ func (client RouteTablesClient) UpdateTagsSender(req *http.Request) (future Rout
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client RouteTablesClient) UpdateTagsResponder(resp *http.Response) (result RouteTable, err error) {
+func (client RouteTablesGroupClient) UpdateTagsResponder(resp *http.Response) (result RouteTable, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/securitygroups.go b/services/network/mgmt/2017-11-01/network/securitygroupsgroup.go
similarity index 66%
rename from services/network/mgmt/2017-11-01/network/securitygroups.go
rename to services/network/mgmt/2017-11-01/network/securitygroupsgroup.go
index 544615f63f4a..6f00b93ceb55 100644
--- a/services/network/mgmt/2017-11-01/network/securitygroups.go
+++ b/services/network/mgmt/2017-11-01/network/securitygroupsgroup.go
@@ -24,35 +24,35 @@ import (
 	"net/http"
 )
 
-// SecurityGroupsClient is the network Client
-type SecurityGroupsClient struct {
+// SecurityGroupsGroupClient is the network Client
+type SecurityGroupsGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityGroupsClient creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
-	return NewSecurityGroupsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityGroupsGroupClient creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClient(subscriptionID string) SecurityGroupsGroupClient {
+	return NewSecurityGroupsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityGroupsClientWithBaseURI creates an instance of the SecurityGroupsClient client.
-func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
-	return SecurityGroupsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityGroupsGroupClientWithBaseURI creates an instance of the SecurityGroupsGroupClient client.
+func NewSecurityGroupsGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsGroupClient {
+	return SecurityGroupsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a network security group in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. parameters is parameters supplied to the create or update network security group operation.
-func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (result SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -60,7 +60,7 @@ func (client SecurityGroupsClient) CreateOrUpdate(ctx context.Context, resourceG
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters SecurityGroup) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -84,7 +84,7 @@ func (client SecurityGroupsClient) CreateOrUpdatePreparer(ctx context.Context, r
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsCreateOrUpdateFuture, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityGroupsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -99,7 +99,7 @@ func (client SecurityGroupsClient) CreateOrUpdateSender(req *http.Request) (futu
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -114,16 +114,16 @@ func (client SecurityGroupsClient) CreateOrUpdateResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityGroupsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -131,7 +131,7 @@ func (client SecurityGroupsClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -153,7 +153,7 @@ func (client SecurityGroupsClient) DeletePreparer(ctx context.Context, resourceG
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future SecurityGroupsDeleteFuture, err error) {
+func (client SecurityGroupsGroupClient) DeleteSender(req *http.Request) (future SecurityGroupsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -168,7 +168,7 @@ func (client SecurityGroupsClient) DeleteSender(req *http.Request) (future Secur
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityGroupsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -182,30 +182,30 @@ func (client SecurityGroupsClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. expand is expands referenced resources.
-func (client SecurityGroupsClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (result SecurityGroup, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -230,14 +230,14 @@ func (client SecurityGroupsClient) GetPreparer(ctx context.Context, resourceGrou
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) GetResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,31 +251,31 @@ func (client SecurityGroupsClient) GetResponder(resp *http.Response) (result Sec
 // List gets all network security groups in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client SecurityGroupsClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) List(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -296,14 +296,14 @@ func (client SecurityGroupsClient) ListPreparer(ctx context.Context, resourceGro
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -315,10 +315,10 @@ func (client SecurityGroupsClient) ListResponder(resp *http.Response) (result Se
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -326,47 +326,47 @@ func (client SecurityGroupsClient) listNextResults(lastResults SecurityGroupList
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all network security groups in a subscription.
-func (client SecurityGroupsClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
+func (client SecurityGroupsGroupClient) ListAll(ctx context.Context) (result SecurityGroupListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.sglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.sglr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -386,14 +386,14 @@ func (client SecurityGroupsClient) ListAllPreparer(ctx context.Context) (*http.R
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client SecurityGroupsGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) ListAllResponder(resp *http.Response) (result SecurityGroupListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -405,10 +405,10 @@ func (client SecurityGroupsClient) ListAllResponder(resp *http.Response) (result
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
+func (client SecurityGroupsGroupClient) listAllNextResults(lastResults SecurityGroupListResult) (result SecurityGroupListResult, err error) {
 	req, err := lastResults.securityGroupListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -416,17 +416,17 @@ func (client SecurityGroupsClient) listAllNextResults(lastResults SecurityGroupL
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
+func (client SecurityGroupsGroupClient) ListAllComplete(ctx context.Context) (result SecurityGroupListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -435,16 +435,16 @@ func (client SecurityGroupsClient) ListAllComplete(ctx context.Context) (result
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. parameters is parameters supplied to update network security group tags.
-func (client SecurityGroupsClient) UpdateTags(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (result SecurityGroupsUpdateTagsFuture, err error) {
+func (client SecurityGroupsGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (result SecurityGroupsGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkSecurityGroupName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityGroupsClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityGroupsGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -452,7 +452,7 @@ func (client SecurityGroupsClient) UpdateTags(ctx context.Context, resourceGroup
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client SecurityGroupsClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (*http.Request, error) {
+func (client SecurityGroupsGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -476,7 +476,7 @@ func (client SecurityGroupsClient) UpdateTagsPreparer(ctx context.Context, resou
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityGroupsClient) UpdateTagsSender(req *http.Request) (future SecurityGroupsUpdateTagsFuture, err error) {
+func (client SecurityGroupsGroupClient) UpdateTagsSender(req *http.Request) (future SecurityGroupsGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -491,7 +491,7 @@ func (client SecurityGroupsClient) UpdateTagsSender(req *http.Request) (future S
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client SecurityGroupsClient) UpdateTagsResponder(resp *http.Response) (result SecurityGroup, err error) {
+func (client SecurityGroupsGroupClient) UpdateTagsResponder(resp *http.Response) (result SecurityGroup, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/securityrules.go b/services/network/mgmt/2017-11-01/network/securityrulesgroup.go
similarity index 67%
rename from services/network/mgmt/2017-11-01/network/securityrules.go
rename to services/network/mgmt/2017-11-01/network/securityrulesgroup.go
index 224dd0521562..670d559a6439 100644
--- a/services/network/mgmt/2017-11-01/network/securityrules.go
+++ b/services/network/mgmt/2017-11-01/network/securityrulesgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SecurityRulesClient is the network Client
-type SecurityRulesClient struct {
+// SecurityRulesGroupClient is the network Client
+type SecurityRulesGroupClient struct {
 	BaseClient
 }
 
-// NewSecurityRulesClient creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
-	return NewSecurityRulesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSecurityRulesGroupClient creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClient(subscriptionID string) SecurityRulesGroupClient {
+	return NewSecurityRulesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSecurityRulesClientWithBaseURI creates an instance of the SecurityRulesClient client.
-func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
-	return SecurityRulesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSecurityRulesGroupClientWithBaseURI creates an instance of the SecurityRulesGroupClient client.
+func NewSecurityRulesGroupClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesGroupClient {
+	return SecurityRulesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a security rule in the specified network security group.
@@ -44,16 +44,16 @@ func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) Se
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule. securityRuleParameters is parameters supplied
 // to the create or update network security rule operation.
-func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (result SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName, securityRuleParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SecurityRulesClient) CreateOrUpdate(ctx context.Context, resourceGr
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
+func (client SecurityRulesGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string, securityRuleParameters SecurityRule) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -86,7 +86,7 @@ func (client SecurityRulesClient) CreateOrUpdatePreparer(ctx context.Context, re
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesCreateOrUpdateFuture, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateSender(req *http.Request) (future SecurityRulesGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SecurityRulesClient) CreateOrUpdateSender(req *http.Request) (futur
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) CreateOrUpdateResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SecurityRulesClient) CreateOrUpdateResponder(resp *http.Response) (
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) Delete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRulesGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SecurityRulesClient) Delete(ctx context.Context, resourceGroupName
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -156,7 +156,7 @@ func (client SecurityRulesClient) DeletePreparer(ctx context.Context, resourceGr
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) DeleteSender(req *http.Request) (future SecurityRulesDeleteFuture, err error) {
+func (client SecurityRulesGroupClient) DeleteSender(req *http.Request) (future SecurityRulesGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SecurityRulesClient) DeleteSender(req *http.Request) (future Securi
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SecurityRulesGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SecurityRulesClient) DeleteResponder(resp *http.Response) (result a
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group. securityRuleName is the name of the security rule.
-func (client SecurityRulesClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) Get(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (result SecurityRule, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkSecurityGroupName, securityRuleName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string, securityRuleName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -231,14 +231,14 @@ func (client SecurityRulesClient) GetPreparer(ctx context.Context, resourceGroup
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
+func (client SecurityRulesGroupClient) GetResponder(resp *http.Response) (result SecurityRule, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -253,31 +253,31 @@ func (client SecurityRulesClient) GetResponder(resp *http.Response) (result Secu
 //
 // resourceGroupName is the name of the resource group. networkSecurityGroupName is the name of the network
 // security group.
-func (client SecurityRulesClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
+func (client SecurityRulesGroupClient) List(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, networkSecurityGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.srlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.srlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
+func (client SecurityRulesGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkSecurityGroupName": autorest.Encode("path", networkSecurityGroupName),
 		"resourceGroupName":        autorest.Encode("path", resourceGroupName),
@@ -299,14 +299,14 @@ func (client SecurityRulesClient) ListPreparer(ctx context.Context, resourceGrou
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SecurityRulesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SecurityRulesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SecurityRulesClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) ListResponder(resp *http.Response) (result SecurityRuleListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -318,10 +318,10 @@ func (client SecurityRulesClient) ListResponder(resp *http.Response) (result Sec
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
+func (client SecurityRulesGroupClient) listNextResults(lastResults SecurityRuleListResult) (result SecurityRuleListResult, err error) {
 	req, err := lastResults.securityRuleListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -329,17 +329,17 @@ func (client SecurityRulesClient) listNextResults(lastResults SecurityRuleListRe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SecurityRulesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SecurityRulesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SecurityRulesClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
+func (client SecurityRulesGroupClient) ListComplete(ctx context.Context, resourceGroupName string, networkSecurityGroupName string) (result SecurityRuleListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, networkSecurityGroupName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/subnets.go b/services/network/mgmt/2017-11-01/network/subnetsgroup.go
similarity index 69%
rename from services/network/mgmt/2017-11-01/network/subnets.go
rename to services/network/mgmt/2017-11-01/network/subnetsgroup.go
index ba05d9bffc33..508f345e121e 100644
--- a/services/network/mgmt/2017-11-01/network/subnets.go
+++ b/services/network/mgmt/2017-11-01/network/subnetsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// SubnetsClient is the network Client
-type SubnetsClient struct {
+// SubnetsGroupClient is the network Client
+type SubnetsGroupClient struct {
 	BaseClient
 }
 
-// NewSubnetsClient creates an instance of the SubnetsClient client.
-func NewSubnetsClient(subscriptionID string) SubnetsClient {
-	return NewSubnetsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewSubnetsGroupClient creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClient(subscriptionID string) SubnetsGroupClient {
+	return NewSubnetsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewSubnetsClientWithBaseURI creates an instance of the SubnetsClient client.
-func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
-	return SubnetsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewSubnetsGroupClientWithBaseURI creates an instance of the SubnetsGroupClient client.
+func NewSubnetsGroupClientWithBaseURI(baseURI string, subscriptionID string) SubnetsGroupClient {
+	return SubnetsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a subnet in the specified virtual network.
@@ -44,16 +44,16 @@ func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsC
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. subnetParameters is parameters supplied to the create or update subnet
 // operation.
-func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (result SubnetsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, subnetParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client SubnetsClient) CreateOrUpdate(ctx context.Context, resourceGroupNam
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
+func (client SubnetsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, subnetParameters Subnet) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -86,7 +86,7 @@ func (client SubnetsClient) CreateOrUpdatePreparer(ctx context.Context, resource
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future SubnetsCreateOrUpdateFuture, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateSender(req *http.Request) (future SubnetsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client SubnetsClient) CreateOrUpdateSender(req *http.Request) (future Subn
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client SubnetsClient) CreateOrUpdateResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet.
-func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (result SubnetsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, subnetName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client SubnetsClient) Delete(ctx context.Context, resourceGroupName string
 }
 
 // DeletePreparer prepares the Delete request.
-func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
+func (client SubnetsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -156,7 +156,7 @@ func (client SubnetsClient) DeletePreparer(ctx context.Context, resourceGroupNam
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDeleteFuture, err error) {
+func (client SubnetsGroupClient) DeleteSender(req *http.Request) (future SubnetsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client SubnetsClient) DeleteSender(req *http.Request) (future SubnetsDelet
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client SubnetsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client SubnetsClient) DeleteResponder(resp *http.Response) (result autores
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // subnetName is the name of the subnet. expand is expands referenced resources.
-func (client SubnetsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
+func (client SubnetsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (result Subnet, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, subnetName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
+func (client SubnetsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, subnetName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subnetName":         autorest.Encode("path", subnetName),
@@ -234,14 +234,14 @@ func (client SubnetsClient) GetPreparer(ctx context.Context, resourceGroupName s
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, err error) {
+func (client SubnetsGroupClient) GetResponder(resp *http.Response) (result Subnet, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -255,31 +255,31 @@ func (client SubnetsClient) GetResponder(resp *http.Response) (result Subnet, er
 // List gets all subnets in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client SubnetsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
+func (client SubnetsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.slr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.slr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client SubnetsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -301,14 +301,14 @@ func (client SubnetsClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client SubnetsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client SubnetsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) ListResponder(resp *http.Response) (result SubnetListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,10 +320,10 @@ func (client SubnetsClient) ListResponder(resp *http.Response) (result SubnetLis
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
+func (client SubnetsGroupClient) listNextResults(lastResults SubnetListResult) (result SubnetListResult, err error) {
 	req, err := lastResults.subnetListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -331,17 +331,17 @@ func (client SubnetsClient) listNextResults(lastResults SubnetListResult) (resul
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.SubnetsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.SubnetsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client SubnetsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
+func (client SubnetsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result SubnetListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/usages.go b/services/network/mgmt/2017-11-01/network/usagesgroup.go
similarity index 64%
rename from services/network/mgmt/2017-11-01/network/usages.go
rename to services/network/mgmt/2017-11-01/network/usagesgroup.go
index 9541e135b3d1..434ee201eafb 100644
--- a/services/network/mgmt/2017-11-01/network/usages.go
+++ b/services/network/mgmt/2017-11-01/network/usagesgroup.go
@@ -25,55 +25,55 @@ import (
 	"net/http"
 )
 
-// UsagesClient is the network Client
-type UsagesClient struct {
+// UsagesGroupClient is the network Client
+type UsagesGroupClient struct {
 	BaseClient
 }
 
-// NewUsagesClient creates an instance of the UsagesClient client.
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return NewUsagesClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewUsagesGroupClient creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClient(subscriptionID string) UsagesGroupClient {
+	return NewUsagesGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewUsagesClientWithBaseURI creates an instance of the UsagesClient client.
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return UsagesClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewUsagesGroupClientWithBaseURI creates an instance of the UsagesGroupClient client.
+func NewUsagesGroupClientWithBaseURI(baseURI string, subscriptionID string) UsagesGroupClient {
+	return UsagesGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // List list network usages for a subscription.
 //
 // location is the location where resource usage is queried.
-func (client UsagesClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
+func (client UsagesGroupClient) List(ctx context.Context, location string) (result UsagesListResultPage, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: location,
 			Constraints: []validation.Constraint{{Target: "location", Name: validation.Pattern, Rule: `^[-\w\._]+$`, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.UsagesClient", "List", err.Error())
+		return result, validation.NewError("network.UsagesGroupClient", "List", err.Error())
 	}
 
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, location)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.ulr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.ulr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
+func (client UsagesGroupClient) ListPreparer(ctx context.Context, location string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"location":       autorest.Encode("path", location),
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
@@ -94,14 +94,14 @@ func (client UsagesClient) ListPreparer(ctx context.Context, location string) (*
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client UsagesClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client UsagesGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) ListResponder(resp *http.Response) (result UsagesListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,10 +113,10 @@ func (client UsagesClient) ListResponder(resp *http.Response) (result UsagesList
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
+func (client UsagesGroupClient) listNextResults(lastResults UsagesListResult) (result UsagesListResult, err error) {
 	req, err := lastResults.usagesListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -124,17 +124,17 @@ func (client UsagesClient) listNextResults(lastResults UsagesListResult) (result
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.UsagesClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.UsagesGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client UsagesClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
+func (client UsagesGroupClient) ListComplete(ctx context.Context, location string) (result UsagesListResultIterator, err error) {
 	result.page, err = client.List(ctx, location)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/version.go b/services/network/mgmt/2017-11-01/network/version.go
index 529dfc64efb4..63850a4b2460 100644
--- a/services/network/mgmt/2017-11-01/network/version.go
+++ b/services/network/mgmt/2017-11-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2017-11-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }
diff --git a/services/network/mgmt/2017-11-01/network/virtualnetworkgatewayconnections.go b/services/network/mgmt/2017-11-01/network/virtualnetworkgatewayconnectionsgroup.go
similarity index 71%
rename from services/network/mgmt/2017-11-01/network/virtualnetworkgatewayconnections.go
rename to services/network/mgmt/2017-11-01/network/virtualnetworkgatewayconnectionsgroup.go
index 781989b9b8be..8d5ed67a732f 100644
--- a/services/network/mgmt/2017-11-01/network/virtualnetworkgatewayconnections.go
+++ b/services/network/mgmt/2017-11-01/network/virtualnetworkgatewayconnectionsgroup.go
@@ -25,20 +25,21 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewayConnectionsClient is the network Client
-type VirtualNetworkGatewayConnectionsClient struct {
+// VirtualNetworkGatewayConnectionsGroupClient is the network Client
+type VirtualNetworkGatewayConnectionsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewayConnectionsClient creates an instance of the VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return NewVirtualNetworkGatewayConnectionsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewayConnectionsGroupClient creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClient(subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewayConnectionsClientWithBaseURI creates an instance of the
-// VirtualNetworkGatewayConnectionsClient client.
-func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return VirtualNetworkGatewayConnectionsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI creates an instance of the
+// VirtualNetworkGatewayConnectionsGroupClient client.
+func NewVirtualNetworkGatewayConnectionsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsGroupClient {
+	return VirtualNetworkGatewayConnectionsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway connection in the specified resource group.
@@ -46,7 +47,7 @@ func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscr
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection. parameters is parameters supplied to the create or update virtual network
 // gateway connection operation.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (result VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat", Name: validation.Null, Rule: true,
@@ -57,18 +58,18 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 					{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2", Name: validation.Null, Rule: false,
 						Chain: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayConnectionPropertiesFormat.LocalNetworkGateway2.LocalNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -76,7 +77,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdate(ctx context.
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VirtualNetworkGatewayConnection) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -100,7 +101,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdatePreparer(ctx
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -115,7 +116,7 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateSender(req *h
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -130,16 +131,16 @@ func (client VirtualNetworkGatewayConnectionsClient) CreateOrUpdateResponder(res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -147,7 +148,7 @@ func (client VirtualNetworkGatewayConnectionsClient) Delete(ctx context.Context,
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -169,7 +170,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeletePreparer(ctx context.
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsDeleteFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -184,7 +185,7 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteSender(req *http.Requ
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -198,30 +199,30 @@ func (client VirtualNetworkGatewayConnectionsClient) DeleteResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection.
-func (client VirtualNetworkGatewayConnectionsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result VirtualNetworkGatewayConnection, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -243,14 +244,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetPreparer(ctx context.Con
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGatewayConnection, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -266,30 +267,30 @@ func (client VirtualNetworkGatewayConnectionsClient) GetResponder(resp *http.Res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection shared key name.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (result ConnectionSharedKey, err error) {
 	req, err := client.GetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSharedKeySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetSharedKeyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "GetSharedKey", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "GetSharedKey", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetSharedKeyPreparer prepares the GetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -311,14 +312,14 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyPreparer(ctx co
 
 // GetSharedKeySender sends the GetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetSharedKeyResponder handles the response to the GetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) GetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -333,31 +334,31 @@ func (client VirtualNetworkGatewayConnectionsClient) GetSharedKeyResponder(resp
 // created.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewayConnectionsClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vngclr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vngclr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -378,14 +379,14 @@ func (client VirtualNetworkGatewayConnectionsClient) ListPreparer(ctx context.Co
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -397,10 +398,10 @@ func (client VirtualNetworkGatewayConnectionsClient) ListResponder(resp *http.Re
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) listNextResults(lastResults VirtualNetworkGatewayConnectionListResult) (result VirtualNetworkGatewayConnectionListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayConnectionListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -408,17 +409,17 @@ func (client VirtualNetworkGatewayConnectionsClient) listNextResults(lastResults
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayConnectionListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -430,25 +431,25 @@ func (client VirtualNetworkGatewayConnectionsClient) ListComplete(ctx context.Co
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection reset shared key Name. parameters is parameters supplied to the begin reset virtual network
 // gateway connection shared key operation through network resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (result VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.KeyLength", Name: validation.InclusiveMaximum, Rule: 128, Chain: nil},
 					{Target: "parameters.KeyLength", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
 				}}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", err.Error())
 	}
 
 	req, err := client.ResetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "ResetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "ResetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -456,7 +457,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKey(ctx context.
 }
 
 // ResetSharedKeyPreparer prepares the ResetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionResetSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -480,7 +481,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyPreparer(ctx
 
 // ResetSharedKeySender sends the ResetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsResetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupResetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -495,7 +496,7 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeySender(req *h
 
 // ResetSharedKeyResponder handles the response to the ResetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) ResetSharedKeyResponder(resp *http.Response) (result ConnectionResetSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -513,22 +514,22 @@ func (client VirtualNetworkGatewayConnectionsClient) ResetSharedKeyResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the virtual network
 // gateway connection name. parameters is parameters supplied to the Begin Set Virtual Network Gateway connection
 // Shared key operation throughNetwork resource provider.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKey(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (result VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Value", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", err.Error())
 	}
 
 	req, err := client.SetSharedKeyPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetSharedKeySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "SetSharedKey", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "SetSharedKey", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -536,7 +537,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKey(ctx context.Co
 }
 
 // SetSharedKeyPreparer prepares the SetSharedKey request.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters ConnectionSharedKey) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -560,7 +561,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyPreparer(ctx co
 
 // SetSharedKeySender sends the SetSharedKey request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsSetSharedKeyFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeySender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupSetSharedKeyFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -575,7 +576,7 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeySender(req *htt
 
 // SetSharedKeyResponder handles the response to the SetSharedKey request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) SetSharedKeyResponder(resp *http.Response) (result ConnectionSharedKey, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -591,16 +592,16 @@ func (client VirtualNetworkGatewayConnectionsClient) SetSharedKeyResponder(resp
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection. parameters is parameters supplied to update virtual network gateway
 // connection tags.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (result VirtualNetworkGatewayConnectionsUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (result VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewayConnectionsGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -608,7 +609,7 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTags(ctx context.Cont
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (*http.Request, error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -632,7 +633,7 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsPreparer(ctx cont
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewayConnectionsUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewayConnectionsGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -647,7 +648,7 @@ func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsSender(req *http.
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewayConnectionsClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListEntity, err error) {
+func (client VirtualNetworkGatewayConnectionsGroupClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGatewayConnectionListEntity, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/virtualnetworkgateways.go b/services/network/mgmt/2017-11-01/network/virtualnetworkgatewaysgroup.go
similarity index 73%
rename from services/network/mgmt/2017-11-01/network/virtualnetworkgateways.go
rename to services/network/mgmt/2017-11-01/network/virtualnetworkgatewaysgroup.go
index 1858facac661..8e4842012a17 100644
--- a/services/network/mgmt/2017-11-01/network/virtualnetworkgateways.go
+++ b/services/network/mgmt/2017-11-01/network/virtualnetworkgatewaysgroup.go
@@ -25,41 +25,41 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkGatewaysClient is the network Client
-type VirtualNetworkGatewaysClient struct {
+// VirtualNetworkGatewaysGroupClient is the network Client
+type VirtualNetworkGatewaysGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkGatewaysClient creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClient(subscriptionID string) VirtualNetworkGatewaysClient {
-	return NewVirtualNetworkGatewaysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkGatewaysGroupClient creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClient(subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return NewVirtualNetworkGatewaysGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkGatewaysClientWithBaseURI creates an instance of the VirtualNetworkGatewaysClient client.
-func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysClient {
-	return VirtualNetworkGatewaysClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkGatewaysGroupClientWithBaseURI creates an instance of the VirtualNetworkGatewaysGroupClient client.
+func NewVirtualNetworkGatewaysGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysGroupClient {
+	return VirtualNetworkGatewaysGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a virtual network gateway in the specified resource group.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to create or update virtual network gateway operation.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (result VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.VirtualNetworkGatewayPropertiesFormat", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.VirtualNetworkGatewaysClient", "CreateOrUpdate", err.Error())
+		return result, validation.NewError("network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", err.Error())
 	}
 
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -67,7 +67,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VirtualNetworkGateway) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -91,7 +91,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkGatewaysGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -106,7 +106,7 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -121,16 +121,16 @@ func (client VirtualNetworkGatewaysClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -138,7 +138,7 @@ func (client VirtualNetworkGatewaysClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -160,7 +160,7 @@ func (client VirtualNetworkGatewaysClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysDeleteFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkGatewaysGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -175,7 +175,7 @@ func (client VirtualNetworkGatewaysClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkGatewaysGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -191,16 +191,16 @@ func (client VirtualNetworkGatewaysClient) DeleteResponder(resp *http.Response)
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Generatevpnclientpackage(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	req, err := client.GeneratevpnclientpackagePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GeneratevpnclientpackageSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Generatevpnclientpackage", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -208,7 +208,7 @@ func (client VirtualNetworkGatewaysClient) Generatevpnclientpackage(ctx context.
 }
 
 // GeneratevpnclientpackagePreparer prepares the Generatevpnclientpackage request.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -232,7 +232,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackagePreparer(ctx
 
 // GeneratevpnclientpackageSender sends the Generatevpnclientpackage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGeneratevpnclientpackageFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageSender(req *http.Request) (future VirtualNetworkGatewaysGroupGeneratevpnclientpackageFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -247,7 +247,7 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageSender(req *h
 
 // GeneratevpnclientpackageResponder handles the response to the Generatevpnclientpackage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GeneratevpnclientpackageResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -264,16 +264,16 @@ func (client VirtualNetworkGatewaysClient) GeneratevpnclientpackageResponder(res
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to the generate virtual network gateway VPN client package
 // operation.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfile(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (result VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	req, err := client.GenerateVpnProfilePreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GenerateVpnProfileSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GenerateVpnProfile", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -281,7 +281,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfile(ctx context.Contex
 }
 
 // GenerateVpnProfilePreparer prepares the GenerateVpnProfile request.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfilePreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters VpnClientParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -305,7 +305,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfilePreparer(ctx contex
 
 // GenerateVpnProfileSender sends the GenerateVpnProfile request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGenerateVpnProfileFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileSender(req *http.Request) (future VirtualNetworkGatewaysGroupGenerateVpnProfileFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -320,7 +320,7 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileSender(req *http.Re
 
 // GenerateVpnProfileResponder handles the response to the GenerateVpnProfile request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GenerateVpnProfileResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -335,30 +335,30 @@ func (client VirtualNetworkGatewaysClient) GenerateVpnProfileResponder(resp *htt
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGateway, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -380,14 +380,14 @@ func (client VirtualNetworkGatewaysClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -403,16 +403,16 @@ func (client VirtualNetworkGatewaysClient) GetResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	req, err := client.GetAdvertisedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetAdvertisedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetAdvertisedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -420,7 +420,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutes(ctx context.Conte
 }
 
 // GetAdvertisedRoutesPreparer prepares the GetAdvertisedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -443,7 +443,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesPreparer(ctx conte
 
 // GetAdvertisedRoutesSender sends the GetAdvertisedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetAdvertisedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetAdvertisedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -458,7 +458,7 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesSender(req *http.R
 
 // GetAdvertisedRoutesResponder handles the response to the GetAdvertisedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetAdvertisedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -473,16 +473,16 @@ func (client VirtualNetworkGatewaysClient) GetAdvertisedRoutesResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. peer is the IP address of the peer to retrieve the status of.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatus(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (result VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	req, err := client.GetBgpPeerStatusPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, peer)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetBgpPeerStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetBgpPeerStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -490,7 +490,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatus(ctx context.Context,
 }
 
 // GetBgpPeerStatusPreparer prepares the GetBgpPeerStatus request.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, peer string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -515,7 +515,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusPreparer(ctx context.
 
 // GetBgpPeerStatusSender sends the GetBgpPeerStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGetBgpPeerStatusFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetBgpPeerStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -530,7 +530,7 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusSender(req *http.Requ
 
 // GetBgpPeerStatusResponder handles the response to the GetBgpPeerStatus request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetBgpPeerStatusResponder(resp *http.Response) (result BgpPeerStatusListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -546,16 +546,16 @@ func (client VirtualNetworkGatewaysClient) GetBgpPeerStatusResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutes(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	req, err := client.GetLearnedRoutesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetLearnedRoutesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetLearnedRoutes", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -563,7 +563,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutes(ctx context.Context,
 }
 
 // GetLearnedRoutesPreparer prepares the GetLearnedRoutes request.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -585,7 +585,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesPreparer(ctx context.
 
 // GetLearnedRoutesSender sends the GetLearnedRoutes request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGetLearnedRoutesFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetLearnedRoutesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -600,7 +600,7 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesSender(req *http.Requ
 
 // GetLearnedRoutesResponder handles the response to the GetLearnedRoutes request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetLearnedRoutesResponder(resp *http.Response) (result GatewayRouteListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -616,16 +616,16 @@ func (client VirtualNetworkGatewaysClient) GetLearnedRoutesResponder(resp *http.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURL(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURL(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture, err error) {
 	req, err := client.GetVpnProfilePackageURLPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetVpnProfilePackageURL", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetVpnProfilePackageURL", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVpnProfilePackageURLSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "GetVpnProfilePackageURL", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "GetVpnProfilePackageURL", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -633,7 +633,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURL(ctx context.C
 }
 
 // GetVpnProfilePackageURLPreparer prepares the GetVpnProfilePackageURL request.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -655,7 +655,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLPreparer(ctx c
 
 // GetVpnProfilePackageURLSender sends the GetVpnProfilePackageURL request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLSender(req *http.Request) (future VirtualNetworkGatewaysGetVpnProfilePackageURLFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLSender(req *http.Request) (future VirtualNetworkGatewaysGroupGetVpnProfilePackageURLFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -670,7 +670,7 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLSender(req *ht
 
 // GetVpnProfilePackageURLResponder handles the response to the GetVpnProfilePackageURL request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) GetVpnProfilePackageURLResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -684,31 +684,31 @@ func (client VirtualNetworkGatewaysClient) GetVpnProfilePackageURLResponder(resp
 // List gets all virtual network gateways by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworkGatewaysClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnglr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -729,14 +729,14 @@ func (client VirtualNetworkGatewaysClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkGatewayListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -748,10 +748,10 @@ func (client VirtualNetworkGatewaysClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listNextResults(lastResults VirtualNetworkGatewayListResult) (result VirtualNetworkGatewayListResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -759,17 +759,17 @@ func (client VirtualNetworkGatewaysClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkGatewayListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
@@ -778,31 +778,31 @@ func (client VirtualNetworkGatewaysClient) ListComplete(ctx context.Context, res
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnections(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultPage, err error) {
 	result.fn = client.listConnectionsNextResults
 	req, err := client.ListConnectionsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.vnglcr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure sending request")
 		return
 	}
 
 	result.vnglcr, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "ListConnections", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "ListConnections", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListConnectionsPreparer prepares the ListConnections request.
-func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -824,14 +824,14 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsPreparer(ctx context.C
 
 // ListConnectionsSender sends the ListConnections request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListConnectionsResponder handles the response to the ListConnections request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsResponder(resp *http.Response) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -843,10 +843,10 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsResponder(resp *http.R
 }
 
 // listConnectionsNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
+func (client VirtualNetworkGatewaysGroupClient) listConnectionsNextResults(lastResults VirtualNetworkGatewayListConnectionsResult) (result VirtualNetworkGatewayListConnectionsResult, err error) {
 	req, err := lastResults.virtualNetworkGatewayListConnectionsResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -854,17 +854,17 @@ func (client VirtualNetworkGatewaysClient) listConnectionsNextResults(lastResult
 	resp, err := client.ListConnectionsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListConnectionsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "listConnectionsNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListConnectionsComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ListConnectionsComplete(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result VirtualNetworkGatewayListConnectionsResultIterator, err error) {
 	result.page, err = client.ListConnections(ctx, resourceGroupName, virtualNetworkGatewayName)
 	return
 }
@@ -874,16 +874,16 @@ func (client VirtualNetworkGatewaysClient) ListConnectionsComplete(ctx context.C
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. gatewayVip is virtual network gateway vip address supplied to the begin reset of the
 // active-active feature enabled gateway.
-func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) Reset(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (result VirtualNetworkGatewaysGroupResetFuture, err error) {
 	req, err := client.ResetPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, gatewayVip)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ResetSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "Reset", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "Reset", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -891,7 +891,7 @@ func (client VirtualNetworkGatewaysClient) Reset(ctx context.Context, resourceGr
 }
 
 // ResetPreparer prepares the Reset request.
-func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, gatewayVip string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -916,7 +916,7 @@ func (client VirtualNetworkGatewaysClient) ResetPreparer(ctx context.Context, re
 
 // ResetSender sends the Reset request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysResetFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetSender(req *http.Request) (future VirtualNetworkGatewaysGroupResetFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -931,7 +931,7 @@ func (client VirtualNetworkGatewaysClient) ResetSender(req *http.Request) (futur
 
 // ResetResponder handles the response to the Reset request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) ResetResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -946,30 +946,30 @@ func (client VirtualNetworkGatewaysClient) ResetResponder(resp *http.Response) (
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevices(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevices(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (result String, err error) {
 	req, err := client.SupportedVpnDevicesPreparer(ctx, resourceGroupName, virtualNetworkGatewayName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "SupportedVpnDevices", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "SupportedVpnDevices", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.SupportedVpnDevicesSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "SupportedVpnDevices", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "SupportedVpnDevices", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.SupportedVpnDevicesResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "SupportedVpnDevices", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "SupportedVpnDevices", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // SupportedVpnDevicesPreparer prepares the SupportedVpnDevices request.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevicesPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -991,14 +991,14 @@ func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesPreparer(ctx conte
 
 // SupportedVpnDevicesSender sends the SupportedVpnDevices request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevicesSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // SupportedVpnDevicesResponder handles the response to the SupportedVpnDevices request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) SupportedVpnDevicesResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1013,16 +1013,16 @@ func (client VirtualNetworkGatewaysClient) SupportedVpnDevicesResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayName is the name of the virtual
 // network gateway. parameters is parameters supplied to update virtual network gateway tags.
-func (client VirtualNetworkGatewaysClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (result VirtualNetworkGatewaysUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (result VirtualNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkGatewayName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1030,7 +1030,7 @@ func (client VirtualNetworkGatewaysClient) UpdateTags(ctx context.Context, resou
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client VirtualNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -1054,7 +1054,7 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsPreparer(ctx context.Contex
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewaysUpdateTagsFuture, err error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTagsSender(req *http.Request) (future VirtualNetworkGatewaysGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1069,7 +1069,7 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsSender(req *http.Request) (
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
+func (client VirtualNetworkGatewaysGroupClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetworkGateway, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1085,30 +1085,30 @@ func (client VirtualNetworkGatewaysClient) UpdateTagsResponder(resp *http.Respon
 // resourceGroupName is the name of the resource group. virtualNetworkGatewayConnectionName is the name of the
 // virtual network gateway connection for which the configuration script is generated. parameters is parameters
 // supplied to the generate vpn device script operation.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScript(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScript(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (result String, err error) {
 	req, err := client.VpnDeviceConfigurationScriptPreparer(ctx, resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "VpnDeviceConfigurationScript", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "VpnDeviceConfigurationScript", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.VpnDeviceConfigurationScriptSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "VpnDeviceConfigurationScript", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "VpnDeviceConfigurationScript", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.VpnDeviceConfigurationScriptResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysClient", "VpnDeviceConfigurationScript", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkGatewaysGroupClient", "VpnDeviceConfigurationScript", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // VpnDeviceConfigurationScriptPreparer prepares the VpnDeviceConfigurationScript request.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (*http.Request, error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScriptPreparer(ctx context.Context, resourceGroupName string, virtualNetworkGatewayConnectionName string, parameters VpnDeviceScriptParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":                   autorest.Encode("path", resourceGroupName),
 		"subscriptionId":                      autorest.Encode("path", client.SubscriptionID),
@@ -1132,14 +1132,14 @@ func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptPreparer(
 
 // VpnDeviceConfigurationScriptSender sends the VpnDeviceConfigurationScript request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScriptSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // VpnDeviceConfigurationScriptResponder handles the response to the VpnDeviceConfigurationScript request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkGatewaysClient) VpnDeviceConfigurationScriptResponder(resp *http.Response) (result String, err error) {
+func (client VirtualNetworkGatewaysGroupClient) VpnDeviceConfigurationScriptResponder(resp *http.Response) (result String, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/virtualnetworkpeerings.go b/services/network/mgmt/2017-11-01/network/virtualnetworkpeeringsgroup.go
similarity index 70%
rename from services/network/mgmt/2017-11-01/network/virtualnetworkpeerings.go
rename to services/network/mgmt/2017-11-01/network/virtualnetworkpeeringsgroup.go
index 12ed02fe936b..3435ef31c720 100644
--- a/services/network/mgmt/2017-11-01/network/virtualnetworkpeerings.go
+++ b/services/network/mgmt/2017-11-01/network/virtualnetworkpeeringsgroup.go
@@ -24,19 +24,19 @@ import (
 	"net/http"
 )
 
-// VirtualNetworkPeeringsClient is the network Client
-type VirtualNetworkPeeringsClient struct {
+// VirtualNetworkPeeringsGroupClient is the network Client
+type VirtualNetworkPeeringsGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworkPeeringsClient creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
-	return NewVirtualNetworkPeeringsClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworkPeeringsGroupClient creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClient(subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return NewVirtualNetworkPeeringsGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworkPeeringsClientWithBaseURI creates an instance of the VirtualNetworkPeeringsClient client.
-func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
-	return VirtualNetworkPeeringsClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworkPeeringsGroupClientWithBaseURI creates an instance of the VirtualNetworkPeeringsGroupClient client.
+func NewVirtualNetworkPeeringsGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsGroupClient {
+	return VirtualNetworkPeeringsGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CreateOrUpdate creates or updates a peering in the specified virtual network.
@@ -44,16 +44,16 @@ func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID s
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the peering. virtualNetworkPeeringParameters is parameters supplied to
 // the create or update virtual network peering operation.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (result VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName, virtualNetworkPeeringParameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -61,7 +61,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdate(ctx context.Context, r
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string, virtualNetworkPeeringParameters VirtualNetworkPeering) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -86,7 +86,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdatePreparer(ctx context.Co
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsCreateOrUpdateFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworkPeeringsGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -101,7 +101,7 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateSender(req *http.Reques
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -116,16 +116,16 @@ func (client VirtualNetworkPeeringsClient) CreateOrUpdateResponder(resp *http.Re
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -133,7 +133,7 @@ func (client VirtualNetworkPeeringsClient) Delete(ctx context.Context, resourceG
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -156,7 +156,7 @@ func (client VirtualNetworkPeeringsClient) DeletePreparer(ctx context.Context, r
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsDeleteFuture, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteSender(req *http.Request) (future VirtualNetworkPeeringsGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -171,7 +171,7 @@ func (client VirtualNetworkPeeringsClient) DeleteSender(req *http.Request) (futu
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworkPeeringsGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -185,30 +185,30 @@ func (client VirtualNetworkPeeringsClient) DeleteResponder(resp *http.Response)
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // virtualNetworkPeeringName is the name of the virtual network peering.
-func (client VirtualNetworkPeeringsClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (result VirtualNetworkPeering, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, virtualNetworkPeeringName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, virtualNetworkPeeringName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":         autorest.Encode("path", resourceGroupName),
 		"subscriptionId":            autorest.Encode("path", client.SubscriptionID),
@@ -231,14 +231,14 @@ func (client VirtualNetworkPeeringsClient) GetPreparer(ctx context.Context, reso
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
+func (client VirtualNetworkPeeringsGroupClient) GetResponder(resp *http.Response) (result VirtualNetworkPeering, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -252,31 +252,31 @@ func (client VirtualNetworkPeeringsClient) GetResponder(resp *http.Response) (re
 // List gets all virtual network peerings in a virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworkPeeringsClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
+func (client VirtualNetworkPeeringsGroupClient) List(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnplr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnplr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -298,14 +298,14 @@ func (client VirtualNetworkPeeringsClient) ListPreparer(ctx context.Context, res
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworkPeeringsClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworkPeeringsGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkPeeringListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -317,10 +317,10 @@ func (client VirtualNetworkPeeringsClient) ListResponder(resp *http.Response) (r
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
+func (client VirtualNetworkPeeringsGroupClient) listNextResults(lastResults VirtualNetworkPeeringListResult) (result VirtualNetworkPeeringListResult, err error) {
 	req, err := lastResults.virtualNetworkPeeringListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -328,17 +328,17 @@ func (client VirtualNetworkPeeringsClient) listNextResults(lastResults VirtualNe
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworkPeeringsGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworkPeeringsClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
+func (client VirtualNetworkPeeringsGroupClient) ListComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkPeeringListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
diff --git a/services/network/mgmt/2017-11-01/network/virtualnetworks.go b/services/network/mgmt/2017-11-01/network/virtualnetworksgroup.go
similarity index 71%
rename from services/network/mgmt/2017-11-01/network/virtualnetworks.go
rename to services/network/mgmt/2017-11-01/network/virtualnetworksgroup.go
index 8e3945087d40..da7dbcaebb00 100644
--- a/services/network/mgmt/2017-11-01/network/virtualnetworks.go
+++ b/services/network/mgmt/2017-11-01/network/virtualnetworksgroup.go
@@ -24,49 +24,49 @@ import (
 	"net/http"
 )
 
-// VirtualNetworksClient is the network Client
-type VirtualNetworksClient struct {
+// VirtualNetworksGroupClient is the network Client
+type VirtualNetworksGroupClient struct {
 	BaseClient
 }
 
-// NewVirtualNetworksClient creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return NewVirtualNetworksClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewVirtualNetworksGroupClient creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClient(subscriptionID string) VirtualNetworksGroupClient {
+	return NewVirtualNetworksGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewVirtualNetworksClientWithBaseURI creates an instance of the VirtualNetworksClient client.
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return VirtualNetworksClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewVirtualNetworksGroupClientWithBaseURI creates an instance of the VirtualNetworksGroupClient client.
+func NewVirtualNetworksGroupClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksGroupClient {
+	return VirtualNetworksGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckIPAddressAvailability checks whether a private IP address is available for use.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // IPAddress is the private IP address to be verified.
-func (client VirtualNetworksClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailability(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (result IPAddressAvailabilityResult, err error) {
 	req, err := client.CheckIPAddressAvailabilityPreparer(ctx, resourceGroupName, virtualNetworkName, IPAddress)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CheckIPAddressAvailabilitySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CheckIPAddressAvailabilityResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CheckIPAddressAvailability", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CheckIPAddressAvailabilityPreparer prepares the CheckIPAddressAvailability request.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, IPAddress string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -91,14 +91,14 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityPreparer(ctx conte
 
 // CheckIPAddressAvailabilitySender sends the CheckIPAddressAvailability request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilitySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CheckIPAddressAvailabilityResponder handles the response to the CheckIPAddressAvailability request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
+func (client VirtualNetworksGroupClient) CheckIPAddressAvailabilityResponder(resp *http.Response) (result IPAddressAvailabilityResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -113,16 +113,16 @@ func (client VirtualNetworksClient) CheckIPAddressAvailabilityResponder(resp *ht
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // parameters is parameters supplied to the create or update virtual network operation
-func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (result VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, virtualNetworkName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "CreateOrUpdate", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "CreateOrUpdate", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (client VirtualNetworksClient) CreateOrUpdate(ctx context.Context, resource
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters VirtualNetwork) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -154,7 +154,7 @@ func (client VirtualNetworksClient) CreateOrUpdatePreparer(ctx context.Context,
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksCreateOrUpdateFuture, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateSender(req *http.Request) (future VirtualNetworksGroupCreateOrUpdateFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -169,7 +169,7 @@ func (client VirtualNetworksClient) CreateOrUpdateSender(req *http.Request) (fut
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) CreateOrUpdateResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -183,16 +183,16 @@ func (client VirtualNetworksClient) CreateOrUpdateResponder(resp *http.Response)
 // Delete deletes the specified virtual network.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) Delete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworksGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -200,7 +200,7 @@ func (client VirtualNetworksClient) Delete(ctx context.Context, resourceGroupNam
 }
 
 // DeletePreparer prepares the Delete request.
-func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -222,7 +222,7 @@ func (client VirtualNetworksClient) DeletePreparer(ctx context.Context, resource
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future VirtualNetworksDeleteFuture, err error) {
+func (client VirtualNetworksGroupClient) DeleteSender(req *http.Request) (future VirtualNetworksGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -237,7 +237,7 @@ func (client VirtualNetworksClient) DeleteSender(req *http.Request) (future Virt
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client VirtualNetworksGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -251,30 +251,30 @@ func (client VirtualNetworksClient) DeleteResponder(resp *http.Response) (result
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // expand is expands referenced resources.
-func (client VirtualNetworksClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) Get(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (result VirtualNetwork, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, virtualNetworkName, expand)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, expand string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -299,14 +299,14 @@ func (client VirtualNetworksClient) GetPreparer(ctx context.Context, resourceGro
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) GetResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -320,31 +320,31 @@ func (client VirtualNetworksClient) GetResponder(resp *http.Response) (result Vi
 // List gets all virtual networks in a resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client VirtualNetworksClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) List(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listNextResults
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -365,14 +365,14 @@ func (client VirtualNetworksClient) ListPreparer(ctx context.Context, resourceGr
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -384,10 +384,10 @@ func (client VirtualNetworksClient) ListResponder(resp *http.Response) (result V
 }
 
 // listNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -395,47 +395,47 @@ func (client VirtualNetworksClient) listNextResults(lastResults VirtualNetworkLi
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListComplete(ctx context.Context, resourceGroupName string) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.List(ctx, resourceGroupName)
 	return
 }
 
 // ListAll gets all virtual networks in a subscription.
-func (client VirtualNetworksClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListAll(ctx context.Context) (result VirtualNetworkListResultPage, err error) {
 	result.fn = client.listAllNextResults
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.vnlr.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlr, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -455,14 +455,14 @@ func (client VirtualNetworksClient) ListAllPreparer(ctx context.Context) (*http.
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) ListAllResponder(resp *http.Response) (result VirtualNetworkListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -474,10 +474,10 @@ func (client VirtualNetworksClient) ListAllResponder(resp *http.Response) (resul
 }
 
 // listAllNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
+func (client VirtualNetworksGroupClient) listAllNextResults(lastResults VirtualNetworkListResult) (result VirtualNetworkListResult, err error) {
 	req, err := lastResults.virtualNetworkListResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -485,17 +485,17 @@ func (client VirtualNetworksClient) listAllNextResults(lastResults VirtualNetwor
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listAllNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listAllNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListAllComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListAllComplete(ctx context.Context) (result VirtualNetworkListResultIterator, err error) {
 	result.page, err = client.ListAll(ctx)
 	return
 }
@@ -503,31 +503,31 @@ func (client VirtualNetworksClient) ListAllComplete(ctx context.Context) (result
 // ListUsage lists usage stats.
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
-func (client VirtualNetworksClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
+func (client VirtualNetworksGroupClient) ListUsage(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultPage, err error) {
 	result.fn = client.listUsageNextResults
 	req, err := client.ListUsagePreparer(ctx, resourceGroupName, virtualNetworkName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.vnlur.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure sending request")
 		return
 	}
 
 	result.vnlur, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "ListUsage", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "ListUsage", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListUsagePreparer prepares the ListUsage request.
-func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) ListUsagePreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -549,14 +549,14 @@ func (client VirtualNetworksClient) ListUsagePreparer(ctx context.Context, resou
 
 // ListUsageSender sends the ListUsage request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) ListUsageSender(req *http.Request) (*http.Response, error) {
+func (client VirtualNetworksGroupClient) ListUsageSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListUsageResponder handles the response to the ListUsage request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) ListUsageResponder(resp *http.Response) (result VirtualNetworkListUsageResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -568,10 +568,10 @@ func (client VirtualNetworksClient) ListUsageResponder(resp *http.Response) (res
 }
 
 // listUsageNextResults retrieves the next set of results, if any.
-func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
+func (client VirtualNetworksGroupClient) listUsageNextResults(lastResults VirtualNetworkListUsageResult) (result VirtualNetworkListUsageResult, err error) {
 	req, err := lastResults.virtualNetworkListUsageResultPreparer()
 	if err != nil {
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", nil, "Failure preparing next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", nil, "Failure preparing next results request")
 	}
 	if req == nil {
 		return
@@ -579,17 +579,17 @@ func (client VirtualNetworksClient) listUsageNextResults(lastResults VirtualNetw
 	resp, err := client.ListUsageSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure sending next results request")
+		return result, autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure sending next results request")
 	}
 	result, err = client.ListUsageResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "listUsageNextResults", resp, "Failure responding to next results request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "listUsageNextResults", resp, "Failure responding to next results request")
 	}
 	return
 }
 
 // ListUsageComplete enumerates all values, automatically crossing page boundaries as required.
-func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
+func (client VirtualNetworksGroupClient) ListUsageComplete(ctx context.Context, resourceGroupName string, virtualNetworkName string) (result VirtualNetworkListUsageResultIterator, err error) {
 	result.page, err = client.ListUsage(ctx, resourceGroupName, virtualNetworkName)
 	return
 }
@@ -598,16 +598,16 @@ func (client VirtualNetworksClient) ListUsageComplete(ctx context.Context, resou
 //
 // resourceGroupName is the name of the resource group. virtualNetworkName is the name of the virtual network.
 // parameters is parameters supplied to update virtual network tags.
-func (client VirtualNetworksClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (result VirtualNetworksUpdateTagsFuture, err error) {
+func (client VirtualNetworksGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (result VirtualNetworksGroupUpdateTagsFuture, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, virtualNetworkName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.UpdateTagsSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.VirtualNetworksClient", "UpdateTags", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.VirtualNetworksGroupClient", "UpdateTags", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -615,7 +615,7 @@ func (client VirtualNetworksClient) UpdateTags(ctx context.Context, resourceGrou
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client VirtualNetworksClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (*http.Request, error) {
+func (client VirtualNetworksGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, virtualNetworkName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
 		"subscriptionId":     autorest.Encode("path", client.SubscriptionID),
@@ -639,7 +639,7 @@ func (client VirtualNetworksClient) UpdateTagsPreparer(ctx context.Context, reso
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client VirtualNetworksClient) UpdateTagsSender(req *http.Request) (future VirtualNetworksUpdateTagsFuture, err error) {
+func (client VirtualNetworksGroupClient) UpdateTagsSender(req *http.Request) (future VirtualNetworksGroupUpdateTagsFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -654,7 +654,7 @@ func (client VirtualNetworksClient) UpdateTagsSender(req *http.Request) (future
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client VirtualNetworksClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetwork, err error) {
+func (client VirtualNetworksGroupClient) UpdateTagsResponder(resp *http.Response) (result VirtualNetwork, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2017-11-01/network/watchers.go b/services/network/mgmt/2017-11-01/network/watchersgroup.go
similarity index 71%
rename from services/network/mgmt/2017-11-01/network/watchers.go
rename to services/network/mgmt/2017-11-01/network/watchersgroup.go
index 47e93accbfd8..48498f687a72 100644
--- a/services/network/mgmt/2017-11-01/network/watchers.go
+++ b/services/network/mgmt/2017-11-01/network/watchersgroup.go
@@ -25,19 +25,19 @@ import (
 	"net/http"
 )
 
-// WatchersClient is the network Client
-type WatchersClient struct {
+// WatchersGroupClient is the network Client
+type WatchersGroupClient struct {
 	BaseClient
 }
 
-// NewWatchersClient creates an instance of the WatchersClient client.
-func NewWatchersClient(subscriptionID string) WatchersClient {
-	return NewWatchersClientWithBaseURI(DefaultBaseURI, subscriptionID)
+// NewWatchersGroupClient creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClient(subscriptionID string) WatchersGroupClient {
+	return NewWatchersGroupClientWithBaseURI(DefaultBaseURI, subscriptionID)
 }
 
-// NewWatchersClientWithBaseURI creates an instance of the WatchersClient client.
-func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) WatchersClient {
-	return WatchersClient{NewWithBaseURI(baseURI, subscriptionID)}
+// NewWatchersGroupClientWithBaseURI creates an instance of the WatchersGroupClient client.
+func NewWatchersGroupClientWithBaseURI(baseURI string, subscriptionID string) WatchersGroupClient {
+	return WatchersGroupClient{NewWithBaseURI(baseURI, subscriptionID)}
 }
 
 // CheckConnectivity verifies the possibility of establishing a direct TCP connection from a virtual machine to a given
@@ -45,24 +45,24 @@ func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) Watcher
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that determine how the connectivity check will be performed.
-func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivity(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (result WatchersGroupCheckConnectivityFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.Source", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.Source.ResourceID", Name: validation.Null, Rule: true, Chain: nil}}},
 				{Target: "parameters.Destination", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "CheckConnectivity", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "CheckConnectivity", err.Error())
 	}
 
 	req, err := client.CheckConnectivityPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.CheckConnectivitySender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CheckConnectivity", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CheckConnectivity", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -70,7 +70,7 @@ func (client WatchersClient) CheckConnectivity(ctx context.Context, resourceGrou
 }
 
 // CheckConnectivityPreparer prepares the CheckConnectivity request.
-func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
+func (client WatchersGroupClient) CheckConnectivityPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters ConnectivityParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -94,7 +94,7 @@ func (client WatchersClient) CheckConnectivityPreparer(ctx context.Context, reso
 
 // CheckConnectivitySender sends the CheckConnectivity request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future WatchersCheckConnectivityFuture, err error) {
+func (client WatchersGroupClient) CheckConnectivitySender(req *http.Request) (future WatchersGroupCheckConnectivityFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -109,7 +109,7 @@ func (client WatchersClient) CheckConnectivitySender(req *http.Request) (future
 
 // CheckConnectivityResponder handles the response to the CheckConnectivity request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
+func (client WatchersGroupClient) CheckConnectivityResponder(resp *http.Response) (result ConnectivityInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -124,30 +124,30 @@ func (client WatchersClient) CheckConnectivityResponder(resp *http.Response) (re
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the network watcher resource.
-func (client WatchersClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (result Watcher, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.CreateOrUpdateSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.CreateOrUpdateResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "CreateOrUpdate", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "CreateOrUpdate", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // CreateOrUpdatePreparer prepares the CreateOrUpdate request.
-func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
+func (client WatchersGroupClient) CreateOrUpdatePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters Watcher) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -171,14 +171,14 @@ func (client WatchersClient) CreateOrUpdatePreparer(ctx context.Context, resourc
 
 // CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) CreateOrUpdateResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -192,16 +192,16 @@ func (client WatchersClient) CreateOrUpdateResponder(resp *http.Response) (resul
 // Delete deletes the specified network watcher resource.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) Delete(ctx context.Context, resourceGroupName string, networkWatcherName string) (result WatchersGroupDeleteFuture, err error) {
 	req, err := client.DeletePreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.DeleteSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Delete", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Delete", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -209,7 +209,7 @@ func (client WatchersClient) Delete(ctx context.Context, resourceGroupName strin
 }
 
 // DeletePreparer prepares the Delete request.
-func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) DeletePreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -231,7 +231,7 @@ func (client WatchersClient) DeletePreparer(ctx context.Context, resourceGroupNa
 
 // DeleteSender sends the Delete request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDeleteFuture, err error) {
+func (client WatchersGroupClient) DeleteSender(req *http.Request) (future WatchersGroupDeleteFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -246,7 +246,7 @@ func (client WatchersClient) DeleteSender(req *http.Request) (future WatchersDel
 
 // DeleteResponder handles the response to the Delete request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
+func (client WatchersGroupClient) DeleteResponder(resp *http.Response) (result autorest.Response, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -259,30 +259,30 @@ func (client WatchersClient) DeleteResponder(resp *http.Response) (result autore
 // Get gets the specified network watcher by resource group.
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
-func (client WatchersClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
+func (client WatchersGroupClient) Get(ctx context.Context, resourceGroupName string, networkWatcherName string) (result Watcher, err error) {
 	req, err := client.GetPreparer(ctx, resourceGroupName, networkWatcherName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "Get", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "Get", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetPreparer prepares the Get request.
-func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
+func (client WatchersGroupClient) GetPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -304,14 +304,14 @@ func (client WatchersClient) GetPreparer(ctx context.Context, resourceGroupName
 
 // GetSender sends the Get request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetResponder handles the response to the Get request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) GetResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -327,25 +327,25 @@ func (client WatchersClient) GetResponder(resp *http.Response) (result Watcher,
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that determine Azure reachability report configuration.
-func (client WatchersClient) GetAzureReachabilityReport(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (result WatchersGetAzureReachabilityReportFuture, err error) {
+func (client WatchersGroupClient) GetAzureReachabilityReport(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (result WatchersGroupGetAzureReachabilityReportFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.ProviderLocation", Name: validation.Null, Rule: true,
 				Chain: []validation.Constraint{{Target: "parameters.ProviderLocation.Country", Name: validation.Null, Rule: true, Chain: nil}}},
 				{Target: "parameters.StartTime", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.EndTime", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetAzureReachabilityReport", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetAzureReachabilityReport", err.Error())
 	}
 
 	req, err := client.GetAzureReachabilityReportPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetAzureReachabilityReport", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetAzureReachabilityReport", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetAzureReachabilityReportSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetAzureReachabilityReport", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetAzureReachabilityReport", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -353,7 +353,7 @@ func (client WatchersClient) GetAzureReachabilityReport(ctx context.Context, res
 }
 
 // GetAzureReachabilityReportPreparer prepares the GetAzureReachabilityReport request.
-func (client WatchersClient) GetAzureReachabilityReportPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetAzureReachabilityReportPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AzureReachabilityReportParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -377,7 +377,7 @@ func (client WatchersClient) GetAzureReachabilityReportPreparer(ctx context.Cont
 
 // GetAzureReachabilityReportSender sends the GetAzureReachabilityReport request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetAzureReachabilityReportSender(req *http.Request) (future WatchersGetAzureReachabilityReportFuture, err error) {
+func (client WatchersGroupClient) GetAzureReachabilityReportSender(req *http.Request) (future WatchersGroupGetAzureReachabilityReportFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -392,7 +392,7 @@ func (client WatchersClient) GetAzureReachabilityReportSender(req *http.Request)
 
 // GetAzureReachabilityReportResponder handles the response to the GetAzureReachabilityReport request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetAzureReachabilityReportResponder(resp *http.Response) (result AzureReachabilityReport, err error) {
+func (client WatchersGroupClient) GetAzureReachabilityReportResponder(resp *http.Response) (result AzureReachabilityReport, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -407,22 +407,22 @@ func (client WatchersClient) GetAzureReachabilityReportResponder(resp *http.Resp
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define a resource to query flow log status.
-func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatus(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (result WatchersGroupGetFlowLogStatusFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetFlowLogStatus", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetFlowLogStatus", err.Error())
 	}
 
 	req, err := client.GetFlowLogStatusPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetFlowLogStatusSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetFlowLogStatus", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -430,7 +430,7 @@ func (client WatchersClient) GetFlowLogStatus(ctx context.Context, resourceGroup
 }
 
 // GetFlowLogStatusPreparer prepares the GetFlowLogStatus request.
-func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetFlowLogStatusPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogStatusParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -454,7 +454,7 @@ func (client WatchersClient) GetFlowLogStatusPreparer(ctx context.Context, resou
 
 // GetFlowLogStatusSender sends the GetFlowLogStatus request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGetFlowLogStatusFuture, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusSender(req *http.Request) (future WatchersGroupGetFlowLogStatusFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -469,7 +469,7 @@ func (client WatchersClient) GetFlowLogStatusSender(req *http.Request) (future W
 
 // GetFlowLogStatusResponder handles the response to the GetFlowLogStatus request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) GetFlowLogStatusResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -484,24 +484,24 @@ func (client WatchersClient) GetFlowLogStatusResponder(resp *http.Response) (res
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the source and destination endpoint.
-func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHop(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (result WatchersGroupGetNextHopFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.SourceIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.DestinationIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetNextHop", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetNextHop", err.Error())
 	}
 
 	req, err := client.GetNextHopPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetNextHopSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetNextHop", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetNextHop", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -509,7 +509,7 @@ func (client WatchersClient) GetNextHop(ctx context.Context, resourceGroupName s
 }
 
 // GetNextHopPreparer prepares the GetNextHop request.
-func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetNextHopPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters NextHopParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -533,7 +533,7 @@ func (client WatchersClient) GetNextHopPreparer(ctx context.Context, resourceGro
 
 // GetNextHopSender sends the GetNextHop request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetNextHopSender(req *http.Request) (future WatchersGetNextHopFuture, err error) {
+func (client WatchersGroupClient) GetNextHopSender(req *http.Request) (future WatchersGroupGetNextHopFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -548,7 +548,7 @@ func (client WatchersClient) GetNextHopSender(req *http.Request) (future Watcher
 
 // GetNextHopResponder handles the response to the GetNextHop request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
+func (client WatchersGroupClient) GetNextHopResponder(resp *http.Response) (result NextHopResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -563,30 +563,30 @@ func (client WatchersClient) GetNextHopResponder(resp *http.Response) (result Ne
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the representation of topology.
-func (client WatchersClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopology(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (result Topology, err error) {
 	req, err := client.GetTopologyPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.GetTopologySender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.GetTopologyResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTopology", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTopology", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // GetTopologyPreparer prepares the GetTopology request.
-func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTopologyPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TopologyParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -610,14 +610,14 @@ func (client WatchersClient) GetTopologyPreparer(ctx context.Context, resourceGr
 
 // GetTopologySender sends the GetTopology request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTopologySender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) GetTopologySender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // GetTopologyResponder handles the response to the GetTopology request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
+func (client WatchersGroupClient) GetTopologyResponder(resp *http.Response) (result Topology, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -632,7 +632,7 @@ func (client WatchersClient) GetTopologyResponder(resp *http.Response) (result T
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to troubleshoot.
-func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshooting(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (result WatchersGroupGetTroubleshootingFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -640,18 +640,18 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 					Chain: []validation.Constraint{{Target: "parameters.TroubleshootingProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.TroubleshootingProperties.StoragePath", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshooting", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshooting", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshooting", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshooting", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -659,7 +659,7 @@ func (client WatchersClient) GetTroubleshooting(ctx context.Context, resourceGro
 }
 
 // GetTroubleshootingPreparer prepares the GetTroubleshooting request.
-func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -683,7 +683,7 @@ func (client WatchersClient) GetTroubleshootingPreparer(ctx context.Context, res
 
 // GetTroubleshootingSender sends the GetTroubleshooting request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future WatchersGetTroubleshootingFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingSender(req *http.Request) (future WatchersGroupGetTroubleshootingFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -698,7 +698,7 @@ func (client WatchersClient) GetTroubleshootingSender(req *http.Request) (future
 
 // GetTroubleshootingResponder handles the response to the GetTroubleshooting request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -713,22 +713,22 @@ func (client WatchersClient) GetTroubleshootingResponder(resp *http.Response) (r
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher
 // resource. parameters is parameters that define the resource to query the troubleshooting result.
-func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResult(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (result WatchersGroupGetTroubleshootingResultFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetTroubleshootingResult", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetTroubleshootingResult", err.Error())
 	}
 
 	req, err := client.GetTroubleshootingResultPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetTroubleshootingResultSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetTroubleshootingResult", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -736,7 +736,7 @@ func (client WatchersClient) GetTroubleshootingResult(ctx context.Context, resou
 }
 
 // GetTroubleshootingResultPreparer prepares the GetTroubleshootingResult request.
-func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetTroubleshootingResultPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters QueryTroubleshootingParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -760,7 +760,7 @@ func (client WatchersClient) GetTroubleshootingResultPreparer(ctx context.Contex
 
 // GetTroubleshootingResultSender sends the GetTroubleshootingResult request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGetTroubleshootingResultFuture, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultSender(req *http.Request) (future WatchersGroupGetTroubleshootingResultFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -775,7 +775,7 @@ func (client WatchersClient) GetTroubleshootingResultSender(req *http.Request) (
 
 // GetTroubleshootingResultResponder handles the response to the GetTroubleshootingResult request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
+func (client WatchersGroupClient) GetTroubleshootingResultResponder(resp *http.Response) (result TroubleshootingResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -790,22 +790,22 @@ func (client WatchersClient) GetTroubleshootingResultResponder(resp *http.Respon
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the VM to check security groups for.
-func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRules(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (result WatchersGroupGetVMSecurityRulesFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "GetVMSecurityRules", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "GetVMSecurityRules", err.Error())
 	}
 
 	req, err := client.GetVMSecurityRulesPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.GetVMSecurityRulesSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "GetVMSecurityRules", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -813,7 +813,7 @@ func (client WatchersClient) GetVMSecurityRules(ctx context.Context, resourceGro
 }
 
 // GetVMSecurityRulesPreparer prepares the GetVMSecurityRules request.
-func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
+func (client WatchersGroupClient) GetVMSecurityRulesPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters SecurityGroupViewParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -837,7 +837,7 @@ func (client WatchersClient) GetVMSecurityRulesPreparer(ctx context.Context, res
 
 // GetVMSecurityRulesSender sends the GetVMSecurityRules request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGetVMSecurityRulesFuture, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesSender(req *http.Request) (future WatchersGroupGetVMSecurityRulesFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -852,7 +852,7 @@ func (client WatchersClient) GetVMSecurityRulesSender(req *http.Request) (future
 
 // GetVMSecurityRulesResponder handles the response to the GetVMSecurityRules request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
+func (client WatchersGroupClient) GetVMSecurityRulesResponder(resp *http.Response) (result SecurityGroupViewResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -866,30 +866,30 @@ func (client WatchersClient) GetVMSecurityRulesResponder(resp *http.Response) (r
 // List gets all network watchers by resource group.
 //
 // resourceGroupName is the name of the resource group.
-func (client WatchersClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) List(ctx context.Context, resourceGroupName string) (result WatcherListResult, err error) {
 	req, err := client.ListPreparer(ctx, resourceGroupName)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "List", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "List", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListPreparer prepares the List request.
-func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
+func (client WatchersGroupClient) ListPreparer(ctx context.Context, resourceGroupName string) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"resourceGroupName": autorest.Encode("path", resourceGroupName),
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
@@ -910,14 +910,14 @@ func (client WatchersClient) ListPreparer(ctx context.Context, resourceGroupName
 
 // ListSender sends the List request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListResponder handles the response to the List request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -929,30 +929,30 @@ func (client WatchersClient) ListResponder(resp *http.Response) (result WatcherL
 }
 
 // ListAll gets all network watchers by subscription.
-func (client WatchersClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAll(ctx context.Context) (result WatcherListResult, err error) {
 	req, err := client.ListAllPreparer(ctx)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.ListAllSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.ListAllResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAll", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAll", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // ListAllPreparer prepares the ListAll request.
-func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
+func (client WatchersGroupClient) ListAllPreparer(ctx context.Context) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
@@ -972,14 +972,14 @@ func (client WatchersClient) ListAllPreparer(ctx context.Context) (*http.Request
 
 // ListAllSender sends the ListAll request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListAllSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) ListAllSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // ListAllResponder handles the response to the ListAll request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
+func (client WatchersGroupClient) ListAllResponder(resp *http.Response) (result WatcherListResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -994,16 +994,16 @@ func (client WatchersClient) ListAllResponder(resp *http.Response) (result Watch
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that scope the list of available providers.
-func (client WatchersClient) ListAvailableProviders(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (result WatchersListAvailableProvidersFuture, err error) {
+func (client WatchersGroupClient) ListAvailableProviders(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (result WatchersGroupListAvailableProvidersFuture, err error) {
 	req, err := client.ListAvailableProvidersPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAvailableProviders", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAvailableProviders", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.ListAvailableProvidersSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "ListAvailableProviders", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "ListAvailableProviders", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1011,7 +1011,7 @@ func (client WatchersClient) ListAvailableProviders(ctx context.Context, resourc
 }
 
 // ListAvailableProvidersPreparer prepares the ListAvailableProviders request.
-func (client WatchersClient) ListAvailableProvidersPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (*http.Request, error) {
+func (client WatchersGroupClient) ListAvailableProvidersPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters AvailableProvidersListParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1035,7 +1035,7 @@ func (client WatchersClient) ListAvailableProvidersPreparer(ctx context.Context,
 
 // ListAvailableProvidersSender sends the ListAvailableProviders request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) ListAvailableProvidersSender(req *http.Request) (future WatchersListAvailableProvidersFuture, err error) {
+func (client WatchersGroupClient) ListAvailableProvidersSender(req *http.Request) (future WatchersGroupListAvailableProvidersFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1050,7 +1050,7 @@ func (client WatchersClient) ListAvailableProvidersSender(req *http.Request) (fu
 
 // ListAvailableProvidersResponder handles the response to the ListAvailableProviders request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) ListAvailableProvidersResponder(resp *http.Response) (result AvailableProvidersList, err error) {
+func (client WatchersGroupClient) ListAvailableProvidersResponder(resp *http.Response) (result AvailableProvidersList, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1065,7 +1065,7 @@ func (client WatchersClient) ListAvailableProvidersResponder(resp *http.Response
 //
 // resourceGroupName is the name of the network watcher resource group. networkWatcherName is the name of the
 // network watcher resource. parameters is parameters that define the configuration of flow log.
-func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfiguration(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (result WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -1073,18 +1073,18 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 					Chain: []validation.Constraint{{Target: "parameters.FlowLogProperties.StorageID", Name: validation.Null, Rule: true, Chain: nil},
 						{Target: "parameters.FlowLogProperties.Enabled", Name: validation.Null, Rule: true, Chain: nil},
 					}}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "SetFlowLogConfiguration", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "SetFlowLogConfiguration", err.Error())
 	}
 
 	req, err := client.SetFlowLogConfigurationPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.SetFlowLogConfigurationSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "SetFlowLogConfiguration", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1092,7 +1092,7 @@ func (client WatchersClient) SetFlowLogConfiguration(ctx context.Context, resour
 }
 
 // SetFlowLogConfigurationPreparer prepares the SetFlowLogConfiguration request.
-func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters FlowLogInformation) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1116,7 +1116,7 @@ func (client WatchersClient) SetFlowLogConfigurationPreparer(ctx context.Context
 
 // SetFlowLogConfigurationSender sends the SetFlowLogConfiguration request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersSetFlowLogConfigurationFuture, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationSender(req *http.Request) (future WatchersGroupSetFlowLogConfigurationFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1131,7 +1131,7 @@ func (client WatchersClient) SetFlowLogConfigurationSender(req *http.Request) (f
 
 // SetFlowLogConfigurationResponder handles the response to the SetFlowLogConfiguration request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
+func (client WatchersGroupClient) SetFlowLogConfigurationResponder(resp *http.Response) (result FlowLogInformation, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1146,30 +1146,30 @@ func (client WatchersClient) SetFlowLogConfigurationResponder(resp *http.Respons
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters supplied to update network watcher tags.
-func (client WatchersClient) UpdateTags(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (result Watcher, err error) {
+func (client WatchersGroupClient) UpdateTags(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (result Watcher, err error) {
 	req, err := client.UpdateTagsPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "UpdateTags", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "UpdateTags", nil, "Failure preparing request")
 		return
 	}
 
 	resp, err := client.UpdateTagsSender(req)
 	if err != nil {
 		result.Response = autorest.Response{Response: resp}
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "UpdateTags", resp, "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "UpdateTags", resp, "Failure sending request")
 		return
 	}
 
 	result, err = client.UpdateTagsResponder(resp)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "UpdateTags", resp, "Failure responding to request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "UpdateTags", resp, "Failure responding to request")
 	}
 
 	return
 }
 
 // UpdateTagsPreparer prepares the UpdateTags request.
-func (client WatchersClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (*http.Request, error) {
+func (client WatchersGroupClient) UpdateTagsPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters TagsObject) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1193,14 +1193,14 @@ func (client WatchersClient) UpdateTagsPreparer(ctx context.Context, resourceGro
 
 // UpdateTagsSender sends the UpdateTags request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) UpdateTagsSender(req *http.Request) (*http.Response, error) {
+func (client WatchersGroupClient) UpdateTagsSender(req *http.Request) (*http.Response, error) {
 	return autorest.SendWithSender(client, req,
 		azure.DoRetryWithRegistration(client.Client))
 }
 
 // UpdateTagsResponder handles the response to the UpdateTags request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) UpdateTagsResponder(resp *http.Response) (result Watcher, err error) {
+func (client WatchersGroupClient) UpdateTagsResponder(resp *http.Response) (result Watcher, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
@@ -1215,7 +1215,7 @@ func (client WatchersClient) UpdateTagsResponder(resp *http.Response) (result Wa
 //
 // resourceGroupName is the name of the resource group. networkWatcherName is the name of the network watcher.
 // parameters is parameters that define the IP flow to be verified.
-func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlow(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (result WatchersGroupVerifyIPFlowFuture, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: parameters,
 			Constraints: []validation.Constraint{{Target: "parameters.TargetResourceID", Name: validation.Null, Rule: true, Chain: nil},
@@ -1223,18 +1223,18 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 				{Target: "parameters.RemotePort", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.LocalIPAddress", Name: validation.Null, Rule: true, Chain: nil},
 				{Target: "parameters.RemoteIPAddress", Name: validation.Null, Rule: true, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("network.WatchersClient", "VerifyIPFlow", err.Error())
+		return result, validation.NewError("network.WatchersGroupClient", "VerifyIPFlow", err.Error())
 	}
 
 	req, err := client.VerifyIPFlowPreparer(ctx, resourceGroupName, networkWatcherName, parameters)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", nil, "Failure preparing request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", nil, "Failure preparing request")
 		return
 	}
 
 	result, err = client.VerifyIPFlowSender(req)
 	if err != nil {
-		err = autorest.NewErrorWithError(err, "network.WatchersClient", "VerifyIPFlow", result.Response(), "Failure sending request")
+		err = autorest.NewErrorWithError(err, "network.WatchersGroupClient", "VerifyIPFlow", result.Response(), "Failure sending request")
 		return
 	}
 
@@ -1242,7 +1242,7 @@ func (client WatchersClient) VerifyIPFlow(ctx context.Context, resourceGroupName
 }
 
 // VerifyIPFlowPreparer prepares the VerifyIPFlow request.
-func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
+func (client WatchersGroupClient) VerifyIPFlowPreparer(ctx context.Context, resourceGroupName string, networkWatcherName string, parameters VerificationIPFlowParameters) (*http.Request, error) {
 	pathParameters := map[string]interface{}{
 		"networkWatcherName": autorest.Encode("path", networkWatcherName),
 		"resourceGroupName":  autorest.Encode("path", resourceGroupName),
@@ -1266,7 +1266,7 @@ func (client WatchersClient) VerifyIPFlowPreparer(ctx context.Context, resourceG
 
 // VerifyIPFlowSender sends the VerifyIPFlow request. The method will close the
 // http.Response Body if it receives an error.
-func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future WatchersVerifyIPFlowFuture, err error) {
+func (client WatchersGroupClient) VerifyIPFlowSender(req *http.Request) (future WatchersGroupVerifyIPFlowFuture, err error) {
 	sender := autorest.DecorateSender(client, azure.DoRetryWithRegistration(client.Client))
 	future.Future = azure.NewFuture(req)
 	future.req = req
@@ -1281,7 +1281,7 @@ func (client WatchersClient) VerifyIPFlowSender(req *http.Request) (future Watch
 
 // VerifyIPFlowResponder handles the response to the VerifyIPFlow request. The method always
 // closes the http.Response Body.
-func (client WatchersClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
+func (client WatchersGroupClient) VerifyIPFlowResponder(resp *http.Response) (result VerificationIPFlowResult, err error) {
 	err = autorest.Respond(
 		resp,
 		client.ByInspecting(),
diff --git a/services/network/mgmt/2018-01-01/network/models.go b/services/network/mgmt/2018-01-01/network/models.go
index 4c63e61c94a4..3bac6d063859 100644
--- a/services/network/mgmt/2018-01-01/network/models.go
+++ b/services/network/mgmt/2018-01-01/network/models.go
@@ -36,6 +36,11 @@ const (
 	Deny Access = "Deny"
 )
 
+// PossibleAccessValues returns an array of possible values for the Access const type.
+func PossibleAccessValues() [2]Access {
+	return [2]Access{Allow, Deny}
+}
+
 // ApplicationGatewayBackendHealthServerHealth enumerates the values for application gateway backend health
 // server health.
 type ApplicationGatewayBackendHealthServerHealth string
@@ -53,6 +58,11 @@ const (
 	Up ApplicationGatewayBackendHealthServerHealth = "Up"
 )
 
+// PossibleApplicationGatewayBackendHealthServerHealthValues returns an array of possible values for the ApplicationGatewayBackendHealthServerHealth const type.
+func PossibleApplicationGatewayBackendHealthServerHealthValues() [5]ApplicationGatewayBackendHealthServerHealth {
+	return [5]ApplicationGatewayBackendHealthServerHealth{Down, Draining, Partial, Unknown, Up}
+}
+
 // ApplicationGatewayCookieBasedAffinity enumerates the values for application gateway cookie based affinity.
 type ApplicationGatewayCookieBasedAffinity string
 
@@ -63,6 +73,11 @@ const (
 	Enabled ApplicationGatewayCookieBasedAffinity = "Enabled"
 )
 
+// PossibleApplicationGatewayCookieBasedAffinityValues returns an array of possible values for the ApplicationGatewayCookieBasedAffinity const type.
+func PossibleApplicationGatewayCookieBasedAffinityValues() [2]ApplicationGatewayCookieBasedAffinity {
+	return [2]ApplicationGatewayCookieBasedAffinity{Disabled, Enabled}
+}
+
 // ApplicationGatewayFirewallMode enumerates the values for application gateway firewall mode.
 type ApplicationGatewayFirewallMode string
 
@@ -73,6 +88,11 @@ const (
 	Prevention ApplicationGatewayFirewallMode = "Prevention"
 )
 
+// PossibleApplicationGatewayFirewallModeValues returns an array of possible values for the ApplicationGatewayFirewallMode const type.
+func PossibleApplicationGatewayFirewallModeValues() [2]ApplicationGatewayFirewallMode {
+	return [2]ApplicationGatewayFirewallMode{Detection, Prevention}
+}
+
 // ApplicationGatewayOperationalState enumerates the values for application gateway operational state.
 type ApplicationGatewayOperationalState string
 
@@ -87,6 +107,11 @@ const (
 	Stopping ApplicationGatewayOperationalState = "Stopping"
 )
 
+// PossibleApplicationGatewayOperationalStateValues returns an array of possible values for the ApplicationGatewayOperationalState const type.
+func PossibleApplicationGatewayOperationalStateValues() [4]ApplicationGatewayOperationalState {
+	return [4]ApplicationGatewayOperationalState{Running, Starting, Stopped, Stopping}
+}
+
 // ApplicationGatewayProtocol enumerates the values for application gateway protocol.
 type ApplicationGatewayProtocol string
 
@@ -97,6 +122,11 @@ const (
 	HTTPS ApplicationGatewayProtocol = "Https"
 )
 
+// PossibleApplicationGatewayProtocolValues returns an array of possible values for the ApplicationGatewayProtocol const type.
+func PossibleApplicationGatewayProtocolValues() [2]ApplicationGatewayProtocol {
+	return [2]ApplicationGatewayProtocol{HTTP, HTTPS}
+}
+
 // ApplicationGatewayRedirectType enumerates the values for application gateway redirect type.
 type ApplicationGatewayRedirectType string
 
@@ -111,6 +141,11 @@ const (
 	Temporary ApplicationGatewayRedirectType = "Temporary"
 )
 
+// PossibleApplicationGatewayRedirectTypeValues returns an array of possible values for the ApplicationGatewayRedirectType const type.
+func PossibleApplicationGatewayRedirectTypeValues() [4]ApplicationGatewayRedirectType {
+	return [4]ApplicationGatewayRedirectType{Found, Permanent, SeeOther, Temporary}
+}
+
 // ApplicationGatewayRequestRoutingRuleType enumerates the values for application gateway request routing rule
 // type.
 type ApplicationGatewayRequestRoutingRuleType string
@@ -122,6 +157,11 @@ const (
 	PathBasedRouting ApplicationGatewayRequestRoutingRuleType = "PathBasedRouting"
 )
 
+// PossibleApplicationGatewayRequestRoutingRuleTypeValues returns an array of possible values for the ApplicationGatewayRequestRoutingRuleType const type.
+func PossibleApplicationGatewayRequestRoutingRuleTypeValues() [2]ApplicationGatewayRequestRoutingRuleType {
+	return [2]ApplicationGatewayRequestRoutingRuleType{Basic, PathBasedRouting}
+}
+
 // ApplicationGatewaySkuName enumerates the values for application gateway sku name.
 type ApplicationGatewaySkuName string
 
@@ -138,6 +178,11 @@ const (
 	WAFMedium ApplicationGatewaySkuName = "WAF_Medium"
 )
 
+// PossibleApplicationGatewaySkuNameValues returns an array of possible values for the ApplicationGatewaySkuName const type.
+func PossibleApplicationGatewaySkuNameValues() [5]ApplicationGatewaySkuName {
+	return [5]ApplicationGatewaySkuName{StandardLarge, StandardMedium, StandardSmall, WAFLarge, WAFMedium}
+}
+
 // ApplicationGatewaySslCipherSuite enumerates the values for application gateway ssl cipher suite.
 type ApplicationGatewaySslCipherSuite string
 
@@ -194,6 +239,11 @@ const (
 	TLSRSAWITHAES256GCMSHA384 ApplicationGatewaySslCipherSuite = "TLS_RSA_WITH_AES_256_GCM_SHA384"
 )
 
+// PossibleApplicationGatewaySslCipherSuiteValues returns an array of possible values for the ApplicationGatewaySslCipherSuite const type.
+func PossibleApplicationGatewaySslCipherSuiteValues() [25]ApplicationGatewaySslCipherSuite {
+	return [25]ApplicationGatewaySslCipherSuite{TLSDHEDSSWITHAES128CBCSHA, TLSDHEDSSWITHAES128CBCSHA256, TLSDHEDSSWITHAES256CBCSHA, TLSDHEDSSWITHAES256CBCSHA256, TLSDHERSAWITHAES128CBCSHA, TLSDHERSAWITHAES128GCMSHA256, TLSDHERSAWITHAES256CBCSHA, TLSDHERSAWITHAES256GCMSHA384, TLSECDHEECDSAWITHAES128CBCSHA, TLSECDHEECDSAWITHAES128CBCSHA256, TLSECDHEECDSAWITHAES128GCMSHA256, TLSECDHEECDSAWITHAES256CBCSHA, TLSECDHEECDSAWITHAES256CBCSHA384, TLSECDHEECDSAWITHAES256GCMSHA384, TLSECDHERSAWITHAES128CBCSHA, TLSECDHERSAWITHAES128CBCSHA256, TLSECDHERSAWITHAES256CBCSHA, TLSECDHERSAWITHAES256CBCSHA384, TLSRSAWITH3DESEDECBCSHA, TLSRSAWITHAES128CBCSHA, TLSRSAWITHAES128CBCSHA256, TLSRSAWITHAES128GCMSHA256, TLSRSAWITHAES256CBCSHA, TLSRSAWITHAES256CBCSHA256, TLSRSAWITHAES256GCMSHA384}
+}
+
 // ApplicationGatewaySslPolicyName enumerates the values for application gateway ssl policy name.
 type ApplicationGatewaySslPolicyName string
 
@@ -206,6 +256,11 @@ const (
 	AppGwSslPolicy20170401S ApplicationGatewaySslPolicyName = "AppGwSslPolicy20170401S"
 )
 
+// PossibleApplicationGatewaySslPolicyNameValues returns an array of possible values for the ApplicationGatewaySslPolicyName const type.
+func PossibleApplicationGatewaySslPolicyNameValues() [3]ApplicationGatewaySslPolicyName {
+	return [3]ApplicationGatewaySslPolicyName{AppGwSslPolicy20150501, AppGwSslPolicy20170401, AppGwSslPolicy20170401S}
+}
+
 // ApplicationGatewaySslPolicyType enumerates the values for application gateway ssl policy type.
 type ApplicationGatewaySslPolicyType string
 
@@ -216,6 +271,11 @@ const (
 	Predefined ApplicationGatewaySslPolicyType = "Predefined"
 )
 
+// PossibleApplicationGatewaySslPolicyTypeValues returns an array of possible values for the ApplicationGatewaySslPolicyType const type.
+func PossibleApplicationGatewaySslPolicyTypeValues() [2]ApplicationGatewaySslPolicyType {
+	return [2]ApplicationGatewaySslPolicyType{Custom, Predefined}
+}
+
 // ApplicationGatewaySslProtocol enumerates the values for application gateway ssl protocol.
 type ApplicationGatewaySslProtocol string
 
@@ -228,6 +288,11 @@ const (
 	TLSv12 ApplicationGatewaySslProtocol = "TLSv1_2"
 )
 
+// PossibleApplicationGatewaySslProtocolValues returns an array of possible values for the ApplicationGatewaySslProtocol const type.
+func PossibleApplicationGatewaySslProtocolValues() [3]ApplicationGatewaySslProtocol {
+	return [3]ApplicationGatewaySslProtocol{TLSv10, TLSv11, TLSv12}
+}
+
 // ApplicationGatewayTier enumerates the values for application gateway tier.
 type ApplicationGatewayTier string
 
@@ -238,6 +303,11 @@ const (
 	WAF ApplicationGatewayTier = "WAF"
 )
 
+// PossibleApplicationGatewayTierValues returns an array of possible values for the ApplicationGatewayTier const type.
+func PossibleApplicationGatewayTierValues() [2]ApplicationGatewayTier {
+	return [2]ApplicationGatewayTier{Standard, WAF}
+}
+
 // AssociationType enumerates the values for association type.
 type AssociationType string
 
@@ -248,6 +318,11 @@ const (
 	Contains AssociationType = "Contains"
 )
 
+// PossibleAssociationTypeValues returns an array of possible values for the AssociationType const type.
+func PossibleAssociationTypeValues() [2]AssociationType {
+	return [2]AssociationType{Associated, Contains}
+}
+
 // AuthenticationMethod enumerates the values for authentication method.
 type AuthenticationMethod string
 
@@ -258,6 +333,11 @@ const (
 	EAPTLS AuthenticationMethod = "EAPTLS"
 )
 
+// PossibleAuthenticationMethodValues returns an array of possible values for the AuthenticationMethod const type.
+func PossibleAuthenticationMethodValues() [2]AuthenticationMethod {
+	return [2]AuthenticationMethod{EAPMSCHAPv2, EAPTLS}
+}
+
 // AuthorizationUseStatus enumerates the values for authorization use status.
 type AuthorizationUseStatus string
 
@@ -268,6 +348,11 @@ const (
 	InUse AuthorizationUseStatus = "InUse"
 )
 
+// PossibleAuthorizationUseStatusValues returns an array of possible values for the AuthorizationUseStatus const type.
+func PossibleAuthorizationUseStatusValues() [2]AuthorizationUseStatus {
+	return [2]AuthorizationUseStatus{Available, InUse}
+}
+
 // BgpPeerState enumerates the values for bgp peer state.
 type BgpPeerState string
 
@@ -284,6 +369,11 @@ const (
 	BgpPeerStateUnknown BgpPeerState = "Unknown"
 )
 
+// PossibleBgpPeerStateValues returns an array of possible values for the BgpPeerState const type.
+func PossibleBgpPeerStateValues() [5]BgpPeerState {
+	return [5]BgpPeerState{BgpPeerStateConnected, BgpPeerStateConnecting, BgpPeerStateIdle, BgpPeerStateStopped, BgpPeerStateUnknown}
+}
+
 // ConnectionState enumerates the values for connection state.
 type ConnectionState string
 
@@ -296,6 +386,11 @@ const (
 	ConnectionStateUnreachable ConnectionState = "Unreachable"
 )
 
+// PossibleConnectionStateValues returns an array of possible values for the ConnectionState const type.
+func PossibleConnectionStateValues() [3]ConnectionState {
+	return [3]ConnectionState{ConnectionStateReachable, ConnectionStateUnknown, ConnectionStateUnreachable}
+}
+
 // ConnectionStatus enumerates the values for connection status.
 type ConnectionStatus string
 
@@ -310,6 +405,11 @@ const (
 	ConnectionStatusUnknown ConnectionStatus = "Unknown"
 )
 
+// PossibleConnectionStatusValues returns an array of possible values for the ConnectionStatus const type.
+func PossibleConnectionStatusValues() [4]ConnectionStatus {
+	return [4]ConnectionStatus{ConnectionStatusConnected, ConnectionStatusDegraded, ConnectionStatusDisconnected, ConnectionStatusUnknown}
+}
+
 // DhGroup enumerates the values for dh group.
 type DhGroup string
 
@@ -332,6 +432,11 @@ const (
 	None DhGroup = "None"
 )
 
+// PossibleDhGroupValues returns an array of possible values for the DhGroup const type.
+func PossibleDhGroupValues() [8]DhGroup {
+	return [8]DhGroup{DHGroup1, DHGroup14, DHGroup2, DHGroup2048, DHGroup24, ECP256, ECP384, None}
+}
+
 // Direction enumerates the values for direction.
 type Direction string
 
@@ -342,6 +447,11 @@ const (
 	Outbound Direction = "Outbound"
 )
 
+// PossibleDirectionValues returns an array of possible values for the Direction const type.
+func PossibleDirectionValues() [2]Direction {
+	return [2]Direction{Inbound, Outbound}
+}
+
 // EffectiveRouteSource enumerates the values for effective route source.
 type EffectiveRouteSource string
 
@@ -356,6 +466,11 @@ const (
 	EffectiveRouteSourceVirtualNetworkGateway EffectiveRouteSource = "VirtualNetworkGateway"
 )
 
+// PossibleEffectiveRouteSourceValues returns an array of possible values for the EffectiveRouteSource const type.
+func PossibleEffectiveRouteSourceValues() [4]EffectiveRouteSource {
+	return [4]EffectiveRouteSource{EffectiveRouteSourceDefault, EffectiveRouteSourceUnknown, EffectiveRouteSourceUser, EffectiveRouteSourceVirtualNetworkGateway}
+}
+
 // EffectiveRouteState enumerates the values for effective route state.
 type EffectiveRouteState string
 
@@ -366,6 +481,11 @@ const (
 	Invalid EffectiveRouteState = "Invalid"
 )
 
+// PossibleEffectiveRouteStateValues returns an array of possible values for the EffectiveRouteState const type.
+func PossibleEffectiveRouteStateValues() [2]EffectiveRouteState {
+	return [2]EffectiveRouteState{Active, Invalid}
+}
+
 // EffectiveSecurityRuleProtocol enumerates the values for effective security rule protocol.
 type EffectiveSecurityRuleProtocol string
 
@@ -378,6 +498,11 @@ const (
 	UDP EffectiveSecurityRuleProtocol = "Udp"
 )
 
+// PossibleEffectiveSecurityRuleProtocolValues returns an array of possible values for the EffectiveSecurityRuleProtocol const type.
+func PossibleEffectiveSecurityRuleProtocolValues() [3]EffectiveSecurityRuleProtocol {
+	return [3]EffectiveSecurityRuleProtocol{All, TCP, UDP}
+}
+
 // EvaluationState enumerates the values for evaluation state.
 type EvaluationState string
 
@@ -390,6 +515,11 @@ const (
 	NotStarted EvaluationState = "NotStarted"
 )
 
+// PossibleEvaluationStateValues returns an array of possible values for the EvaluationState const type.
+func PossibleEvaluationStateValues() [3]EvaluationState {
+	return [3]EvaluationState{Completed, InProgress, NotStarted}
+}
+
 // ExpressRouteCircuitPeeringAdvertisedPublicPrefixState enumerates the values for express route circuit
 // peering advertised public prefix state.
 type ExpressRouteCircuitPeeringAdvertisedPublicPrefixState string
@@ -405,6 +535,11 @@ const (
 	ValidationNeeded ExpressRouteCircuitPeeringAdvertisedPublicPrefixState = "ValidationNeeded"
 )
 
+// PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues returns an array of possible values for the ExpressRouteCircuitPeeringAdvertisedPublicPrefixState const type.
+func PossibleExpressRouteCircuitPeeringAdvertisedPublicPrefixStateValues() [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState {
+	return [4]ExpressRouteCircuitPeeringAdvertisedPublicPrefixState{Configured, Configuring, NotConfigured, ValidationNeeded}
+}
+
 // ExpressRouteCircuitPeeringState enumerates the values for express route circuit peering state.
 type ExpressRouteCircuitPeeringState string
 
@@ -415,6 +550,11 @@ const (
 	ExpressRouteCircuitPeeringStateEnabled ExpressRouteCircuitPeeringState = "Enabled"
 )
 
+// PossibleExpressRouteCircuitPeeringStateValues returns an array of possible values for the ExpressRouteCircuitPeeringState const type.
+func PossibleExpressRouteCircuitPeeringStateValues() [2]ExpressRouteCircuitPeeringState {
+	return [2]ExpressRouteCircuitPeeringState{ExpressRouteCircuitPeeringStateDisabled, ExpressRouteCircuitPeeringStateEnabled}
+}
+
 // ExpressRouteCircuitPeeringType enumerates the values for express route circuit peering type.
 type ExpressRouteCircuitPeeringType string
 
@@ -427,6 +567,11 @@ const (
 	MicrosoftPeering ExpressRouteCircuitPeeringType = "MicrosoftPeering"
 )
 
+// PossibleExpressRouteCircuitPeeringTypeValues returns an array of possible values for the ExpressRouteCircuitPeeringType const type.
+func PossibleExpressRouteCircuitPeeringTypeValues() [3]ExpressRouteCircuitPeeringType {
+	return [3]ExpressRouteCircuitPeeringType{AzurePrivatePeering, AzurePublicPeering, MicrosoftPeering}
+}
+
 // ExpressRouteCircuitSkuFamily enumerates the values for express route circuit sku family.
 type ExpressRouteCircuitSkuFamily string
 
@@ -437,6 +582,11 @@ const (
 	UnlimitedData ExpressRouteCircuitSkuFamily = "UnlimitedData"
 )
 
+// PossibleExpressRouteCircuitSkuFamilyValues returns an array of possible values for the ExpressRouteCircuitSkuFamily const type.
+func PossibleExpressRouteCircuitSkuFamilyValues() [2]ExpressRouteCircuitSkuFamily {
+	return [2]ExpressRouteCircuitSkuFamily{MeteredData, UnlimitedData}
+}
+
 // ExpressRouteCircuitSkuTier enumerates the values for express route circuit sku tier.
 type ExpressRouteCircuitSkuTier string
 
@@ -447,6 +597,11 @@ const (
 	ExpressRouteCircuitSkuTierStandard ExpressRouteCircuitSkuTier = "Standard"
 )
 
+// PossibleExpressRouteCircuitSkuTierValues returns an array of possible values for the ExpressRouteCircuitSkuTier const type.
+func PossibleExpressRouteCircuitSkuTierValues() [2]ExpressRouteCircuitSkuTier {
+	return [2]ExpressRouteCircuitSkuTier{ExpressRouteCircuitSkuTierPremium, ExpressRouteCircuitSkuTierStandard}
+}
+
 // IkeEncryption enumerates the values for ike encryption.
 type IkeEncryption string
 
@@ -463,6 +618,11 @@ const (
 	DES3 IkeEncryption = "DES3"
 )
 
+// PossibleIkeEncryptionValues returns an array of possible values for the IkeEncryption const type.
+func PossibleIkeEncryptionValues() [5]IkeEncryption {
+	return [5]IkeEncryption{AES128, AES192, AES256, DES, DES3}
+}
+
 // IkeIntegrity enumerates the values for ike integrity.
 type IkeIntegrity string
 
@@ -477,6 +637,11 @@ const (
 	SHA384 IkeIntegrity = "SHA384"
 )
 
+// PossibleIkeIntegrityValues returns an array of possible values for the IkeIntegrity const type.
+func PossibleIkeIntegrityValues() [4]IkeIntegrity {
+	return [4]IkeIntegrity{MD5, SHA1, SHA256, SHA384}
+}
+
 // IPAllocationMethod enumerates the values for ip allocation method.
 type IPAllocationMethod string
 
@@ -487,6 +652,11 @@ const (
 	Static IPAllocationMethod = "Static"
 )
 
+// PossibleIPAllocationMethodValues returns an array of possible values for the IPAllocationMethod const type.
+func PossibleIPAllocationMethodValues() [2]IPAllocationMethod {
+	return [2]IPAllocationMethod{Dynamic, Static}
+}
+
 // IpsecEncryption enumerates the values for ipsec encryption.
 type IpsecEncryption string
 
@@ -511,6 +681,11 @@ const (
 	IpsecEncryptionNone IpsecEncryption = "None"
 )
 
+// PossibleIpsecEncryptionValues returns an array of possible values for the IpsecEncryption const type.
+func PossibleIpsecEncryptionValues() [9]IpsecEncryption {
+	return [9]IpsecEncryption{IpsecEncryptionAES128, IpsecEncryptionAES192, IpsecEncryptionAES256, IpsecEncryptionDES, IpsecEncryptionDES3, IpsecEncryptionGCMAES128, IpsecEncryptionGCMAES192, IpsecEncryptionGCMAES256, IpsecEncryptionNone}
+}
+
 // IpsecIntegrity enumerates the values for ipsec integrity.
 type IpsecIntegrity string
 
@@ -529,6 +704,11 @@ const (
 	IpsecIntegritySHA256 IpsecIntegrity = "SHA256"
 )
 
+// PossibleIpsecIntegrityValues returns an array of possible values for the IpsecIntegrity const type.
+func PossibleIpsecIntegrityValues() [6]IpsecIntegrity {
+	return [6]IpsecIntegrity{IpsecIntegrityGCMAES128, IpsecIntegrityGCMAES192, IpsecIntegrityGCMAES256, IpsecIntegrityMD5, IpsecIntegritySHA1, IpsecIntegritySHA256}
+}
+
 // IPVersion enumerates the values for ip version.
 type IPVersion string
 
@@ -539,6 +719,11 @@ const (
 	IPv6 IPVersion = "IPv6"
 )
 
+// PossibleIPVersionValues returns an array of possible values for the IPVersion const type.
+func PossibleIPVersionValues() [2]IPVersion {
+	return [2]IPVersion{IPv4, IPv6}
+}
+
 // IssueType enumerates the values for issue type.
 type IssueType string
 
@@ -563,6 +748,11 @@ const (
 	IssueTypeUserDefinedRoute IssueType = "UserDefinedRoute"
 )
 
+// PossibleIssueTypeValues returns an array of possible values for the IssueType const type.
+func PossibleIssueTypeValues() [9]IssueType {
+	return [9]IssueType{IssueTypeAgentStopped, IssueTypeDNSResolution, IssueTypeGuestFirewall, IssueTypeNetworkSecurityRule, IssueTypePlatform, IssueTypePortThrottled, IssueTypeSocketBind, IssueTypeUnknown, IssueTypeUserDefinedRoute}
+}
+
 // LoadBalancerSkuName enumerates the values for load balancer sku name.
 type LoadBalancerSkuName string
 
@@ -573,6 +763,11 @@ const (
 	LoadBalancerSkuNameStandard LoadBalancerSkuName = "Standard"
 )
 
+// PossibleLoadBalancerSkuNameValues returns an array of possible values for the LoadBalancerSkuName const type.
+func PossibleLoadBalancerSkuNameValues() [2]LoadBalancerSkuName {
+	return [2]LoadBalancerSkuName{LoadBalancerSkuNameBasic, LoadBalancerSkuNameStandard}
+}
+
 // LoadDistribution enumerates the values for load distribution.
 type LoadDistribution string
 
@@ -585,6 +780,11 @@ const (
 	SourceIPProtocol LoadDistribution = "SourceIPProtocol"
 )
 
+// PossibleLoadDistributionValues returns an array of possible values for the LoadDistribution const type.
+func PossibleLoadDistributionValues() [3]LoadDistribution {
+	return [3]LoadDistribution{Default, SourceIP, SourceIPProtocol}
+}
+
 // NextHopType enumerates the values for next hop type.
 type NextHopType string
 
@@ -603,6 +803,11 @@ const (
 	NextHopTypeVnetLocal NextHopType = "VnetLocal"
 )
 
+// PossibleNextHopTypeValues returns an array of possible values for the NextHopType const type.
+func PossibleNextHopTypeValues() [6]NextHopType {
+	return [6]NextHopType{NextHopTypeHyperNetGateway, NextHopTypeInternet, NextHopTypeNone, NextHopTypeVirtualAppliance, NextHopTypeVirtualNetworkGateway, NextHopTypeVnetLocal}
+}
+
 // OperationStatus enumerates the values for operation status.
 type OperationStatus string
 
@@ -615,6 +820,11 @@ const (
 	OperationStatusSucceeded OperationStatus = "Succeeded"
 )
 
+// PossibleOperationStatusValues returns an array of possible values for the OperationStatus const type.
+func PossibleOperationStatusValues() [3]OperationStatus {
+	return [3]OperationStatus{OperationStatusFailed, OperationStatusInProgress, OperationStatusSucceeded}
+}
+
 // Origin enumerates the values for origin.
 type Origin string
 
@@ -627,6 +837,11 @@ const (
 	OriginOutbound Origin = "Outbound"
 )
 
+// PossibleOriginValues returns an array of possible values for the Origin const type.
+func PossibleOriginValues() [3]Origin {
+	return [3]Origin{OriginInbound, OriginLocal, OriginOutbound}
+}
+
 // PcError enumerates the values for pc error.
 type PcError string
 
@@ -643,6 +858,11 @@ const (
 	StorageFailed PcError = "StorageFailed"
 )
 
+// PossiblePcErrorValues returns an array of possible values for the PcError const type.
+func PossiblePcErrorValues() [5]PcError {
+	return [5]PcError{AgentStopped, CaptureFailed, InternalError, LocalFileFailed, StorageFailed}
+}
+
 // PcProtocol enumerates the values for pc protocol.
 type PcProtocol string
 
@@ -655,6 +875,11 @@ const (
 	PcProtocolUDP PcProtocol = "UDP"
 )
 
+// PossiblePcProtocolValues returns an array of possible values for the PcProtocol const type.
+func PossiblePcProtocolValues() [3]PcProtocol {
+	return [3]PcProtocol{PcProtocolAny, PcProtocolTCP, PcProtocolUDP}
+}
+
 // PcStatus enumerates the values for pc status.
 type PcStatus string
 
@@ -671,6 +896,11 @@ const (
 	PcStatusUnknown PcStatus = "Unknown"
 )
 
+// PossiblePcStatusValues returns an array of possible values for the PcStatus const type.
+func PossiblePcStatusValues() [5]PcStatus {
+	return [5]PcStatus{PcStatusError, PcStatusNotStarted, PcStatusRunning, PcStatusStopped, PcStatusUnknown}
+}
+
 // PfsGroup enumerates the values for pfs group.
 type PfsGroup string
 
@@ -691,6 +921,11 @@ const (
 	PfsGroupPFS24 PfsGroup = "PFS24"
 )
 
+// PossiblePfsGroupValues returns an array of possible values for the PfsGroup const type.
+func PossiblePfsGroupValues() [7]PfsGroup {
+	return [7]PfsGroup{PfsGroupECP256, PfsGroupECP384, PfsGroupNone, PfsGroupPFS1, PfsGroupPFS2, PfsGroupPFS2048, PfsGroupPFS24}
+}
+
 // ProbeProtocol enumerates the values for probe protocol.
 type ProbeProtocol string
 
@@ -701,6 +936,11 @@ const (
 	ProbeProtocolTCP ProbeProtocol = "Tcp"
 )
 
+// PossibleProbeProtocolValues returns an array of possible values for the ProbeProtocol const type.
+func PossibleProbeProtocolValues() [2]ProbeProtocol {
+	return [2]ProbeProtocol{ProbeProtocolHTTP, ProbeProtocolTCP}
+}
+
 // ProcessorArchitecture enumerates the values for processor architecture.
 type ProcessorArchitecture string
 
@@ -711,6 +951,11 @@ const (
 	X86 ProcessorArchitecture = "X86"
 )
 
+// PossibleProcessorArchitectureValues returns an array of possible values for the ProcessorArchitecture const type.
+func PossibleProcessorArchitectureValues() [2]ProcessorArchitecture {
+	return [2]ProcessorArchitecture{Amd64, X86}
+}
+
 // Protocol enumerates the values for protocol.
 type Protocol string
 
@@ -721,6 +966,11 @@ const (
 	ProtocolUDP Protocol = "UDP"
 )
 
+// PossibleProtocolValues returns an array of possible values for the Protocol const type.
+func PossibleProtocolValues() [2]Protocol {
+	return [2]Protocol{ProtocolTCP, ProtocolUDP}
+}
+
 // ProvisioningState enumerates the values for provisioning state.
 type ProvisioningState string
 
@@ -735,6 +985,11 @@ const (
 	Updating ProvisioningState = "Updating"
 )
 
+// PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type.
+func PossibleProvisioningStateValues() [4]ProvisioningState {
+	return [4]ProvisioningState{Deleting, Failed, Succeeded, Updating}
+}
+
 // PublicIPAddressSkuName enumerates the values for public ip address sku name.
 type PublicIPAddressSkuName string
 
@@ -745,6 +1000,11 @@ const (
 	PublicIPAddressSkuNameStandard PublicIPAddressSkuName = "Standard"
 )
 
+// PossiblePublicIPAddressSkuNameValues returns an array of possible values for the PublicIPAddressSkuName const type.
+func PossiblePublicIPAddressSkuNameValues() [2]PublicIPAddressSkuName {
+	return [2]PublicIPAddressSkuName{PublicIPAddressSkuNameBasic, PublicIPAddressSkuNameStandard}
+}
+
 // RouteNextHopType enumerates the values for route next hop type.
 type RouteNextHopType string
 
@@ -761,6 +1021,11 @@ const (
 	RouteNextHopTypeVnetLocal RouteNextHopType = "VnetLocal"
 )
 
+// PossibleRouteNextHopTypeValues returns an array of possible values for the RouteNextHopType const type.
+func PossibleRouteNextHopTypeValues() [5]RouteNextHopType {
+	return [5]RouteNextHopType{RouteNextHopTypeInternet, RouteNextHopTypeNone, RouteNextHopTypeVirtualAppliance, RouteNextHopTypeVirtualNetworkGateway, RouteNextHopTypeVnetLocal}
+}
+
 // SecurityRuleAccess enumerates the values for security rule access.
 type SecurityRuleAccess string
 
@@ -771,6 +1036,11 @@ const (
 	SecurityRuleAccessDeny SecurityRuleAccess = "Deny"
 )
 
+// PossibleSecurityRuleAccessValues returns an array of possible values for the SecurityRuleAccess const type.
+func PossibleSecurityRuleAccessValues() [2]SecurityRuleAccess {
+	return [2]SecurityRuleAccess{SecurityRuleAccessAllow, SecurityRuleAccessDeny}
+}
+
 // SecurityRuleDirection enumerates the values for security rule direction.
 type SecurityRuleDirection string
 
@@ -781,6 +1051,11 @@ const (
 	SecurityRuleDirectionOutbound SecurityRuleDirection = "Outbound"
 )
 
+// PossibleSecurityRuleDirectionValues returns an array of possible values for the SecurityRuleDirection const type.
+func PossibleSecurityRuleDirectionValues() [2]SecurityRuleDirection {
+	return [2]SecurityRuleDirection{SecurityRuleDirectionInbound, SecurityRuleDirectionOutbound}
+}
+
 // SecurityRuleProtocol enumerates the values for security rule protocol.
 type SecurityRuleProtocol string
 
@@ -793,6 +1068,11 @@ const (
 	SecurityRuleProtocolUDP SecurityRuleProtocol = "Udp"
 )
 
+// PossibleSecurityRuleProtocolValues returns an array of possible values for the SecurityRuleProtocol const type.
+func PossibleSecurityRuleProtocolValues() [3]SecurityRuleProtocol {
+	return [3]SecurityRuleProtocol{SecurityRuleProtocolAsterisk, SecurityRuleProtocolTCP, SecurityRuleProtocolUDP}
+}
+
 // ServiceProviderProvisioningState enumerates the values for service provider provisioning state.
 type ServiceProviderProvisioningState string
 
@@ -807,6 +1087,11 @@ const (
 	Provisioning ServiceProviderProvisioningState = "Provisioning"
 )
 
+// PossibleServiceProviderProvisioningStateValues returns an array of possible values for the ServiceProviderProvisioningState const type.
+func PossibleServiceProviderProvisioningStateValues() [4]ServiceProviderProvisioningState {
+	return [4]ServiceProviderProvisioningState{Deprovisioning, NotProvisioned, Provisioned, Provisioning}
+}
+
 // Severity enumerates the values for severity.
 type Severity string
 
@@ -817,6 +1102,11 @@ const (
 	SeverityWarning Severity = "Warning"
 )
 
+// PossibleSeverityValues returns an array of possible values for the Severity const type.
+func PossibleSeverityValues() [2]Severity {
+	return [2]Severity{SeverityError, SeverityWarning}
+}
+
 // TransportProtocol enumerates the values for transport protocol.
 type TransportProtocol string
 
@@ -829,6 +1119,11 @@ const (
 	TransportProtocolUDP TransportProtocol = "Udp"
 )
 
+// PossibleTransportProtocolValues returns an array of possible values for the TransportProtocol const type.
+func PossibleTransportProtocolValues() [3]TransportProtocol {
+	return [3]TransportProtocol{TransportProtocolAll, TransportProtocolTCP, TransportProtocolUDP}
+}
+
 // VirtualNetworkGatewayConnectionStatus enumerates the values for virtual network gateway connection status.
 type VirtualNetworkGatewayConnectionStatus string
 
@@ -843,6 +1138,11 @@ const (
 	VirtualNetworkGatewayConnectionStatusUnknown VirtualNetworkGatewayConnectionStatus = "Unknown"
 )
 
+// PossibleVirtualNetworkGatewayConnectionStatusValues returns an array of possible values for the VirtualNetworkGatewayConnectionStatus const type.
+func PossibleVirtualNetworkGatewayConnectionStatusValues() [4]VirtualNetworkGatewayConnectionStatus {
+	return [4]VirtualNetworkGatewayConnectionStatus{VirtualNetworkGatewayConnectionStatusConnected, VirtualNetworkGatewayConnectionStatusConnecting, VirtualNetworkGatewayConnectionStatusNotConnected, VirtualNetworkGatewayConnectionStatusUnknown}
+}
+
 // VirtualNetworkGatewayConnectionType enumerates the values for virtual network gateway connection type.
 type VirtualNetworkGatewayConnectionType string
 
@@ -857,6 +1157,11 @@ const (
 	VPNClient VirtualNetworkGatewayConnectionType = "VPNClient"
 )
 
+// PossibleVirtualNetworkGatewayConnectionTypeValues returns an array of possible values for the VirtualNetworkGatewayConnectionType const type.
+func PossibleVirtualNetworkGatewayConnectionTypeValues() [4]VirtualNetworkGatewayConnectionType {
+	return [4]VirtualNetworkGatewayConnectionType{ExpressRoute, IPsec, Vnet2Vnet, VPNClient}
+}
+
 // VirtualNetworkGatewaySkuName enumerates the values for virtual network gateway sku name.
 type VirtualNetworkGatewaySkuName string
 
@@ -877,6 +1182,11 @@ const (
 	VirtualNetworkGatewaySkuNameVpnGw3 VirtualNetworkGatewaySkuName = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuNameValues returns an array of possible values for the VirtualNetworkGatewaySkuName const type.
+func PossibleVirtualNetworkGatewaySkuNameValues() [7]VirtualNetworkGatewaySkuName {
+	return [7]VirtualNetworkGatewaySkuName{VirtualNetworkGatewaySkuNameBasic, VirtualNetworkGatewaySkuNameHighPerformance, VirtualNetworkGatewaySkuNameStandard, VirtualNetworkGatewaySkuNameUltraPerformance, VirtualNetworkGatewaySkuNameVpnGw1, VirtualNetworkGatewaySkuNameVpnGw2, VirtualNetworkGatewaySkuNameVpnGw3}
+}
+
 // VirtualNetworkGatewaySkuTier enumerates the values for virtual network gateway sku tier.
 type VirtualNetworkGatewaySkuTier string
 
@@ -897,6 +1207,11 @@ const (
 	VirtualNetworkGatewaySkuTierVpnGw3 VirtualNetworkGatewaySkuTier = "VpnGw3"
 )
 
+// PossibleVirtualNetworkGatewaySkuTierValues returns an array of possible values for the VirtualNetworkGatewaySkuTier const type.
+func PossibleVirtualNetworkGatewaySkuTierValues() [7]VirtualNetworkGatewaySkuTier {
+	return [7]VirtualNetworkGatewaySkuTier{VirtualNetworkGatewaySkuTierBasic, VirtualNetworkGatewaySkuTierHighPerformance, VirtualNetworkGatewaySkuTierStandard, VirtualNetworkGatewaySkuTierUltraPerformance, VirtualNetworkGatewaySkuTierVpnGw1, VirtualNetworkGatewaySkuTierVpnGw2, VirtualNetworkGatewaySkuTierVpnGw3}
+}
+
 // VirtualNetworkGatewayType enumerates the values for virtual network gateway type.
 type VirtualNetworkGatewayType string
 
@@ -907,6 +1222,11 @@ const (
 	VirtualNetworkGatewayTypeVpn VirtualNetworkGatewayType = "Vpn"
 )
 
+// PossibleVirtualNetworkGatewayTypeValues returns an array of possible values for the VirtualNetworkGatewayType const type.
+func PossibleVirtualNetworkGatewayTypeValues() [2]VirtualNetworkGatewayType {
+	return [2]VirtualNetworkGatewayType{VirtualNetworkGatewayTypeExpressRoute, VirtualNetworkGatewayTypeVpn}
+}
+
 // VirtualNetworkPeeringState enumerates the values for virtual network peering state.
 type VirtualNetworkPeeringState string
 
@@ -919,6 +1239,11 @@ const (
 	Initiated VirtualNetworkPeeringState = "Initiated"
 )
 
+// PossibleVirtualNetworkPeeringStateValues returns an array of possible values for the VirtualNetworkPeeringState const type.
+func PossibleVirtualNetworkPeeringStateValues() [3]VirtualNetworkPeeringState {
+	return [3]VirtualNetworkPeeringState{Connected, Disconnected, Initiated}
+}
+
 // VpnClientProtocol enumerates the values for vpn client protocol.
 type VpnClientProtocol string
 
@@ -929,6 +1254,11 @@ const (
 	SSTP VpnClientProtocol = "SSTP"
 )
 
+// PossibleVpnClientProtocolValues returns an array of possible values for the VpnClientProtocol const type.
+func PossibleVpnClientProtocolValues() [2]VpnClientProtocol {
+	return [2]VpnClientProtocol{IkeV2, SSTP}
+}
+
 // VpnType enumerates the values for vpn type.
 type VpnType string
 
@@ -939,6 +1269,11 @@ const (
 	RouteBased VpnType = "RouteBased"
 )
 
+// PossibleVpnTypeValues returns an array of possible values for the VpnType const type.
+func PossibleVpnTypeValues() [2]VpnType {
+	return [2]VpnType{PolicyBased, RouteBased}
+}
+
 // AddressSpace addressSpace contains an array of IP address ranges that can be used by subnets of the virtual
 // network.
 type AddressSpace struct {
@@ -9452,6 +9787,12 @@ type OutboundNatRulePropertiesFormat struct {
 
 // PacketCapture parameters that define the create packet capture operation.
 type PacketCapture struct {
+	// Name - Name of the packet capture.
+	Name *string `json:"name,omitempty"`
+	// ID - ID of the packet capture.
+	ID *string `json:"id,omitempty"`
+	// Type - Packet capture type.
+	Type                     *string `json:"type,omitempty"`
 	*PacketCaptureParameters `json:"properties,omitempty"`
 }
 
@@ -9464,6 +9805,33 @@ func (pc *PacketCapture) UnmarshalJSON(body []byte) error {
 	}
 	for k, v := range m {
 		switch k {
+		case "name":
+			if v != nil {
+				var name string
+				err = json.Unmarshal(*v, &name)
+				if err != nil {
+					return err
+				}
+				pc.Name = &name
+			}
+		case "id":
+			if v != nil {
+				var ID string
+				err = json.Unmarshal(*v, &ID)
+				if err != nil {
+					return err
+				}
+				pc.ID = &ID
+			}
+		case "type":
+			if v != nil {
+				var typeVar string
+				err = json.Unmarshal(*v, &typeVar)
+				if err != nil {
+					return err
+				}
+				pc.Type = &typeVar
+			}
 		case "properties":
 			if v != nil {
 				var packetCaptureParameters PacketCaptureParameters
@@ -9534,10 +9902,12 @@ type PacketCaptureQueryStatusResult struct {
 // PacketCaptureResult information about packet capture session.
 type PacketCaptureResult struct {
 	autorest.Response `json:"-"`
-	// Name - Name of the packet capture session.
+	// Name - Name of the packet capture.
 	Name *string `json:"name,omitempty"`
-	// ID - ID of the packet capture operation.
-	ID                             *string `json:"id,omitempty"`
+	// ID - ID of the packet capture.
+	ID *string `json:"id,omitempty"`
+	// Type - Packet capture type.
+	Type                           *string `json:"type,omitempty"`
 	Etag                           *string `json:"etag,omitempty"`
 	*PacketCaptureResultProperties `json:"properties,omitempty"`
 }
@@ -9569,6 +9939,15 @@ func (pcr *PacketCaptureResult) UnmarshalJSON(body []byte) error {
 				}
 				pcr.ID = &ID
 			}
+		case "type":
+			if v != nil {
+				var typeVar string
+				err = json.Unmarshal(*v, &typeVar)
+				if err != nil {
+					return err
+				}
+				pcr.Type = &typeVar
+			}
 		case "etag":
 			if v != nil {
 				var etag string
@@ -15935,8 +16314,7 @@ type VpnDeviceScriptParameters struct {
 
 // Watcher network watcher in a resource group.
 type Watcher struct {
-	autorest.Response `json:"-"`
-	// Etag - A unique read-only string that changes whenever the resource is updated.
+	autorest.Response        `json:"-"`
 	Etag                     *string `json:"etag,omitempty"`
 	*WatcherPropertiesFormat `json:"properties,omitempty"`
 	// ID - Resource ID.
diff --git a/services/network/mgmt/2018-01-01/network/version.go b/services/network/mgmt/2018-01-01/network/version.go
index b631f9c1740b..63850a4b2460 100644
--- a/services/network/mgmt/2018-01-01/network/version.go
+++ b/services/network/mgmt/2018-01-01/network/version.go
@@ -1,7 +1,5 @@
 package network
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " network/2018-01-01"
+	return "Azure-SDK-For-Go/latest services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "latest"
 }