diff --git a/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/__init__.py b/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/__init__.py
index 23d58bb9b60a..9a75fc1a0e69 100644
--- a/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/__init__.py
+++ b/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/__init__.py
@@ -9,10 +9,10 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .text_analytics_api import TextAnalyticsAPI
+from .text_analytics_client import TextAnalyticsClient
 from .version import VERSION
 
-__all__ = ['TextAnalyticsAPI']
+__all__ = ['TextAnalyticsClient']
 
 __version__ = VERSION
 
diff --git a/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/models/__init__.py b/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/models/__init__.py
index 5865a93c289b..c90fbe6be4d3 100644
--- a/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/models/__init__.py
+++ b/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/models/__init__.py
@@ -47,9 +47,6 @@
     from .entity_record import EntityRecord
     from .entities_batch_result_item import EntitiesBatchResultItem
     from .entities_batch_result import EntitiesBatchResult
-from .text_analytics_api_enums import (
-    AzureRegions,
-)
 
 __all__ = [
     'MultiLanguageInput',
@@ -70,5 +67,4 @@
     'EntityRecord',
     'EntitiesBatchResultItem',
     'EntitiesBatchResult',
-    'AzureRegions',
 ]
diff --git a/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/models/text_analytics_api_enums.py b/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/models/text_analytics_api_enums.py
deleted file mode 100644
index 8f4166eed385..000000000000
--- a/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/models/text_analytics_api_enums.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-#
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is
-# regenerated.
-# --------------------------------------------------------------------------
-
-from enum import Enum
-
-
-class AzureRegions(str, Enum):
-
-    westus = "westus"
-    westeurope = "westeurope"
-    southeastasia = "southeastasia"
-    eastus2 = "eastus2"
-    westcentralus = "westcentralus"
-    westus2 = "westus2"
-    eastus = "eastus"
-    southcentralus = "southcentralus"
-    northeurope = "northeurope"
-    eastasia = "eastasia"
-    australiaeast = "australiaeast"
-    brazilsouth = "brazilsouth"
diff --git a/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/text_analytics_api.py b/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/text_analytics_client.py
similarity index 84%
rename from azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/text_analytics_api.py
rename to azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/text_analytics_client.py
index fe47b258fcaa..ee6526a34d06 100644
--- a/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/text_analytics_api.py
+++ b/azure-cognitiveservices-language-textanalytics/azure/cognitiveservices/language/textanalytics/text_analytics_client.py
@@ -16,63 +16,55 @@
 from . import models
 
 
-class TextAnalyticsAPIConfiguration(Configuration):
-    """Configuration for TextAnalyticsAPI
+class TextAnalyticsClientConfiguration(Configuration):
+    """Configuration for TextAnalyticsClient
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
-    :param azure_region: Supported Azure regions for Cognitive Services
-     endpoints. Possible values include: 'westus', 'westeurope',
-     'southeastasia', 'eastus2', 'westcentralus', 'westus2', 'eastus',
-     'southcentralus', 'northeurope', 'eastasia', 'australiaeast',
-     'brazilsouth'
-    :type azure_region: str or
-     ~azure.cognitiveservices.language.textanalytics.models.AzureRegions
+    :param endpoint: Supported Cognitive Services endpoints (protocol and
+     hostname, for example: https://westus.api.cognitive.microsoft.com).
+    :type endpoint: str
     :param credentials: Subscription credentials which uniquely identify
      client subscription.
     :type credentials: None
     """
 
     def __init__(
-            self, azure_region, credentials):
+            self, endpoint, credentials):
 
-        if azure_region is None:
-            raise ValueError("Parameter 'azure_region' must not be None.")
+        if endpoint is None:
+            raise ValueError("Parameter 'endpoint' must not be None.")
         if credentials is None:
             raise ValueError("Parameter 'credentials' must not be None.")
-        base_url = 'https://{AzureRegion}.api.cognitive.microsoft.com/text/analytics'
+        base_url = '{Endpoint}/text/analytics/v2.0'
 
-        super(TextAnalyticsAPIConfiguration, self).__init__(base_url)
+        super(TextAnalyticsClientConfiguration, self).__init__(base_url)
 
         self.add_user_agent('azure-cognitiveservices-language-textanalytics/{}'.format(VERSION))
 
-        self.azure_region = azure_region
+        self.endpoint = endpoint
         self.credentials = credentials
 
 
-class TextAnalyticsAPI(SDKClient):
+class TextAnalyticsClient(SDKClient):
     """The Text Analytics API is a suite of text analytics web services built with best-in-class Microsoft machine learning algorithms. The API can be used to analyze unstructured text for tasks such as sentiment analysis, key phrase extraction and language detection. No training data is needed to use this API; just bring your text data. This API uses advanced natural language processing techniques to deliver best in class predictions. Further documentation can be found in https://docs.microsoft.com/en-us/azure/cognitive-services/text-analytics/overview
 
     :ivar config: Configuration for client.
-    :vartype config: TextAnalyticsAPIConfiguration
-
-    :param azure_region: Supported Azure regions for Cognitive Services
-     endpoints. Possible values include: 'westus', 'westeurope',
-     'southeastasia', 'eastus2', 'westcentralus', 'westus2', 'eastus',
-     'southcentralus', 'northeurope', 'eastasia', 'australiaeast',
-     'brazilsouth'
-    :type azure_region: str or
-     ~azure.cognitiveservices.language.textanalytics.models.AzureRegions
+    :vartype config: TextAnalyticsClientConfiguration
+
+    :param endpoint: Supported Cognitive Services endpoints (protocol and
+     hostname, for example: https://westus.api.cognitive.microsoft.com).
+    :type endpoint: str
     :param credentials: Subscription credentials which uniquely identify
      client subscription.
     :type credentials: None
     """
 
     def __init__(
-            self, azure_region, credentials):
+            self, endpoint, credentials):
 
-        self.config = TextAnalyticsAPIConfiguration(azure_region, credentials)
-        super(TextAnalyticsAPI, self).__init__(self.config.credentials, self.config)
+        self.config = TextAnalyticsClientConfiguration(endpoint, credentials)
+        super(TextAnalyticsClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = 'v2.0'
@@ -110,7 +102,7 @@ def key_phrases(
         # Construct URL
         url = self.key_phrases.metadata['url']
         path_format_arguments = {
-            'AzureRegion': self._serialize.url("self.config.azure_region", self.config.azure_region, 'AzureRegions', skip_quote=True)
+            'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True)
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -144,7 +136,7 @@ def key_phrases(
             return client_raw_response
 
         return deserialized
-    key_phrases.metadata = {'url': '/v2.0/keyPhrases'}
+    key_phrases.metadata = {'url': '/keyPhrases'}
 
     def detect_language(
             self, documents=None, custom_headers=None, raw=False, **operation_config):
@@ -174,7 +166,7 @@ def detect_language(
         # Construct URL
         url = self.detect_language.metadata['url']
         path_format_arguments = {
-            'AzureRegion': self._serialize.url("self.config.azure_region", self.config.azure_region, 'AzureRegions', skip_quote=True)
+            'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True)
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -208,7 +200,7 @@ def detect_language(
             return client_raw_response
 
         return deserialized
-    detect_language.metadata = {'url': '/v2.0/languages'}
+    detect_language.metadata = {'url': '/languages'}
 
     def sentiment(
             self, documents=None, custom_headers=None, raw=False, **operation_config):
@@ -241,7 +233,7 @@ def sentiment(
         # Construct URL
         url = self.sentiment.metadata['url']
         path_format_arguments = {
-            'AzureRegion': self._serialize.url("self.config.azure_region", self.config.azure_region, 'AzureRegions', skip_quote=True)
+            'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True)
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -275,7 +267,7 @@ def sentiment(
             return client_raw_response
 
         return deserialized
-    sentiment.metadata = {'url': '/v2.0/sentiment'}
+    sentiment.metadata = {'url': '/sentiment'}
 
     def entities(
             self, documents=None, custom_headers=None, raw=False, **operation_config):
@@ -307,7 +299,7 @@ def entities(
         # Construct URL
         url = self.entities.metadata['url']
         path_format_arguments = {
-            'AzureRegion': self._serialize.url("self.config.azure_region", self.config.azure_region, 'AzureRegions', skip_quote=True)
+            'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True)
         }
         url = self._client.format_url(url, **path_format_arguments)
 
@@ -341,4 +333,4 @@ def entities(
             return client_raw_response
 
         return deserialized
-    entities.metadata = {'url': '/v2.0/entities'}
+    entities.metadata = {'url': '/entities'}