diff --git a/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/__init__.py b/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/__init__.py
index 59c8ad3d6bce..fe35520b791e 100644
--- a/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/__init__.py
+++ b/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/__init__.py
@@ -9,10 +9,10 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .client import Client
+from .location_based_services_management_client import LocationBasedServicesManagementClient
 from .version import VERSION
 
-__all__ = ['Client']
+__all__ = ['LocationBasedServicesManagementClient']
 
 __version__ = VERSION
 
diff --git a/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/client.py b/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/location_based_services_management_client.py
similarity index 86%
rename from azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/client.py
rename to azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/location_based_services_management_client.py
index 5096c5164041..8d09c6c80823 100644
--- a/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/client.py
+++ b/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/location_based_services_management_client.py
@@ -17,8 +17,8 @@
 from . import models
 
 
-class ClientConfiguration(AzureConfiguration):
-    """Configuration for Client
+class LocationBasedServicesManagementClientConfiguration(AzureConfiguration):
+    """Configuration for LocationBasedServicesManagementClient
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
@@ -42,7 +42,7 @@ def __init__(
         if not base_url:
             base_url = 'https://management.azure.com'
 
-        super(ClientConfiguration, self).__init__(base_url)
+        super(LocationBasedServicesManagementClientConfiguration, self).__init__(base_url)
 
         self.add_user_agent('azure-mgmt-locationbasedservices/{}'.format(VERSION))
         self.add_user_agent('Azure-SDK-For-Python')
@@ -51,11 +51,11 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class Client(object):
+class LocationBasedServicesManagementClient(object):
     """Resource Provider
 
     :ivar config: Configuration for client.
-    :vartype config: ClientConfiguration
+    :vartype config: LocationBasedServicesManagementClientConfiguration
 
     :ivar accounts: Accounts operations
     :vartype accounts: azure.mgmt.locationbasedservices.operations.AccountsOperations
@@ -73,7 +73,7 @@ class Client(object):
     def __init__(
             self, credentials, subscription_id, base_url=None):
 
-        self.config = ClientConfiguration(credentials, subscription_id, base_url)
+        self.config = LocationBasedServicesManagementClientConfiguration(credentials, subscription_id, base_url)
         self._client = ServiceClient(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
diff --git a/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/models/__init__.py b/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/models/__init__.py
index 30f680f4ef64..56e3d28685c4 100644
--- a/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/models/__init__.py
+++ b/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/models/__init__.py
@@ -23,7 +23,7 @@
 from .location_based_services_operations_value_item import LocationBasedServicesOperationsValueItem
 from .location_based_services_account_paged import LocationBasedServicesAccountPaged
 from .location_based_services_operations_value_item_paged import LocationBasedServicesOperationsValueItemPaged
-from .client_enums import (
+from .location_based_services_management_client_enums import (
     KeyType,
 )
 
diff --git a/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/models/client_enums.py b/azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/models/location_based_services_management_client_enums.py
similarity index 100%
rename from azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/models/client_enums.py
rename to azure-mgmt-locationbasedservices/azure/mgmt/locationbasedservices/models/location_based_services_management_client_enums.py