diff --git a/azure-cognitiveservices-search-imagesearch/MANIFEST.in b/azure-cognitiveservices-search-imagesearch/MANIFEST.in
index bb37a2723dae..d1c7ea0ea56b 100644
--- a/azure-cognitiveservices-search-imagesearch/MANIFEST.in
+++ b/azure-cognitiveservices-search-imagesearch/MANIFEST.in
@@ -1 +1,5 @@
 include *.rst
+include azure/__init__.py
+include azure/cognitiveservices/__init__.py
+include azure/cognitiveservices/search/__init__.py
+
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/__init__.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/__init__.py
index b90a6e73415d..fd0694dcc1f5 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/__init__.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/__init__.py
@@ -9,10 +9,10 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .image_search_api import ImageSearchAPI
+from .image_search_client import ImageSearchClient
 from .version import VERSION
 
-__all__ = ['ImageSearchAPI']
+__all__ = ['ImageSearchClient']
 
 __version__ = VERSION
 
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/image_search_api.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/image_search_client.py
similarity index 67%
rename from azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/image_search_api.py
rename to azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/image_search_client.py
index 8ff1ef3ca8ff..d7ff2af8d6f4 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/image_search_api.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/image_search_client.py
@@ -16,52 +16,60 @@
 from . import models
 
 
-class ImageSearchAPIConfiguration(Configuration):
-    """Configuration for ImageSearchAPI
+class ImageSearchClientConfiguration(Configuration):
+    """Configuration for ImageSearchClient
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
+    :param endpoint: Supported Cognitive Services endpoints (protocol and
+     hostname, for example: "https://westus.api.cognitive.microsoft.com",
+     "https://api.cognitive.microsoft.com").
+    :type endpoint: str
     :param credentials: Subscription credentials which uniquely identify
      client subscription.
     :type credentials: None
-    :param str base_url: Service URL
     """
 
     def __init__(
-            self, credentials, base_url=None):
+            self, endpoint, credentials):
 
+        if endpoint is None:
+            raise ValueError("Parameter 'endpoint' must not be None.")
         if credentials is None:
             raise ValueError("Parameter 'credentials' must not be None.")
-        if not base_url:
-            base_url = 'https://api.cognitive.microsoft.com/bing/v7.0'
+        base_url = '{Endpoint}/bing/v7.0'
 
-        super(ImageSearchAPIConfiguration, self).__init__(base_url)
+        super(ImageSearchClientConfiguration, self).__init__(base_url)
 
         self.add_user_agent('azure-cognitiveservices-search-imagesearch/{}'.format(VERSION))
 
+        self.endpoint = endpoint
         self.credentials = credentials
 
 
-class ImageSearchAPI(SDKClient):
+class ImageSearchClient(SDKClient):
     """The Image Search API lets you send a search query to Bing and get back a list of relevant images. This section provides technical details about the query parameters and headers that you use to request images and the JSON response objects that contain them. For examples that show how to make requests, see [Searching the Web for Images](https://docs.microsoft.com/azure/cognitive-services/bing-image-search/search-the-web).
 
     :ivar config: Configuration for client.
-    :vartype config: ImageSearchAPIConfiguration
+    :vartype config: ImageSearchClientConfiguration
 
     :ivar images: Images operations
     :vartype images: azure.cognitiveservices.search.imagesearch.operations.ImagesOperations
 
+    :param endpoint: Supported Cognitive Services endpoints (protocol and
+     hostname, for example: "https://westus.api.cognitive.microsoft.com",
+     "https://api.cognitive.microsoft.com").
+    :type endpoint: str
     :param credentials: Subscription credentials which uniquely identify
      client subscription.
     :type credentials: None
-    :param str base_url: Service URL
     """
 
     def __init__(
-            self, credentials, base_url=None):
+            self, endpoint, credentials):
 
-        self.config = ImageSearchAPIConfiguration(credentials, base_url)
-        super(ImageSearchAPI, self).__init__(self.config.credentials, self.config)
+        self.config = ImageSearchClientConfiguration(endpoint, credentials)
+        super(ImageSearchClient, 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 = '1.0'
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/__init__.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/__init__.py
index 8abe388f0610..5c1832752b27 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/__init__.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/__init__.py
@@ -99,7 +99,7 @@
     from .rating import Rating
     from .collection_page import CollectionPage
     from .structured_value import StructuredValue
-from .image_search_api_enums import (
+from .image_search_client_enums import (
     Currency,
     ItemAvailability,
     ErrorCode,
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/aggregate_offer_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/aggregate_offer_py3.py
index c47117c42873..4979096912de 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/aggregate_offer_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/aggregate_offer_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .offer import Offer
+from .offer_py3 import Offer
 
 
 class AggregateOffer(Offer):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/aggregate_rating_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/aggregate_rating_py3.py
index ec4fe8aec9f7..bdd901e708ea 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/aggregate_rating_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/aggregate_rating_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .rating import Rating
+from .rating_py3 import Rating
 
 
 class AggregateRating(Rating):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/answer_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/answer_py3.py
index d7d5df488ee5..9a2bf4ec4acb 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/answer_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/answer_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 
 
 class Answer(Response):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/collection_page_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/collection_page_py3.py
index 94b42baa7a74..941f673d182d 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/collection_page_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/collection_page_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .web_page import WebPage
+from .web_page_py3 import WebPage
 
 
 class CollectionPage(WebPage):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/creative_work_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/creative_work_py3.py
index cc4b45c27e1d..080dd192e24d 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/creative_work_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/creative_work_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .thing import Thing
+from .thing_py3 import Thing
 
 
 class CreativeWork(Thing):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/error_response_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/error_response_py3.py
index f3e9d9de27fe..41f14d16137e 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/error_response_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/error_response_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 from msrest.exceptions import HttpOperationError
 
 
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/identifiable_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/identifiable_py3.py
index c87dc0347e3d..2d24a2c45775 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/identifiable_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/identifiable_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response_base import ResponseBase
+from .response_base_py3 import ResponseBase
 
 
 class Identifiable(ResponseBase):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_gallery_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_gallery_py3.py
index c000f3a264f7..86dd8b0d8d6c 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_gallery_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_gallery_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .collection_page import CollectionPage
+from .collection_page_py3 import CollectionPage
 
 
 class ImageGallery(CollectionPage):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_insights_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_insights_py3.py
index d65240f36067..cafad874448f 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_insights_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_insights_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 
 
 class ImageInsights(Response):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_object.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_object.py
index 21d511be51cd..8c51328eaa58 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_object.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_object.py
@@ -80,7 +80,7 @@ class ImageObject(MediaObject):
      image is of an apple pie, this object includes a count of the number of
      websites where you can buy an apple pie. To indicate the number of offers
      in your UX, include badging such as a shopping cart icon that contains the
-     count. When the user clicks on the icon, use imageInisghtsToken to get the
+     count. When the user clicks on the icon, use imageInsightsToken to get the
      list of websites.
     :vartype insights_metadata:
      ~azure.cognitiveservices.search.imagesearch.models.ImagesImageMetadata
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_object_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_object_py3.py
index ebda17aa57ba..05a867b41768 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_object_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_object_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .media_object import MediaObject
+from .media_object_py3 import MediaObject
 
 
 class ImageObject(MediaObject):
@@ -80,7 +80,7 @@ class ImageObject(MediaObject):
      image is of an apple pie, this object includes a count of the number of
      websites where you can buy an apple pie. To indicate the number of offers
      in your UX, include badging such as a shopping cart icon that contains the
-     count. When the user clicks on the icon, use imageInisghtsToken to get the
+     count. When the user clicks on the icon, use imageInsightsToken to get the
      list of websites.
     :vartype insights_metadata:
      ~azure.cognitiveservices.search.imagesearch.models.ImagesImageMetadata
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_search_api_enums.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_search_client_enums.py
similarity index 100%
rename from azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_search_api_enums.py
rename to azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/image_search_client_enums.py
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/images_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/images_py3.py
index 1b762f7c02e0..436d4373ffc8 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/images_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/images_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .search_results_answer import SearchResultsAnswer
+from .search_results_answer_py3 import SearchResultsAnswer
 
 
 class Images(SearchResultsAnswer):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/intangible_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/intangible_py3.py
index 60ba0360f40f..5c6ad406218b 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/intangible_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/intangible_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .thing import Thing
+from .thing_py3 import Thing
 
 
 class Intangible(Thing):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/media_object_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/media_object_py3.py
index ef1a6ad24dca..67f57da3fba0 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/media_object_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/media_object_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .creative_work import CreativeWork
+from .creative_work_py3 import CreativeWork
 
 
 class MediaObject(CreativeWork):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/normalized_rectangle_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/normalized_rectangle_py3.py
index fc8d22faf57d..bb28c44837e1 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/normalized_rectangle_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/normalized_rectangle_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .structured_value import StructuredValue
+from .structured_value_py3 import StructuredValue
 
 
 class NormalizedRectangle(StructuredValue):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/offer_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/offer_py3.py
index 5a893296dae6..8dad858dc5aa 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/offer_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/offer_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .thing import Thing
+from .thing_py3 import Thing
 
 
 class Offer(Thing):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/organization_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/organization_py3.py
index a23cd3694118..0ad14291d38d 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/organization_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/organization_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .thing import Thing
+from .thing_py3 import Thing
 
 
 class Organization(Thing):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/person_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/person_py3.py
index 5db418a3db8c..40f8ed64aa1b 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/person_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/person_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .thing import Thing
+from .thing_py3 import Thing
 
 
 class Person(Thing):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/rating_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/rating_py3.py
index cf4b1a32eec8..e7334a8e6913 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/rating_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/rating_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .properties_item import PropertiesItem
+from .properties_item_py3 import PropertiesItem
 
 
 class Rating(PropertiesItem):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recipe_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recipe_py3.py
index f3e29acf8e61..9f375b087179 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recipe_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recipe_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .creative_work import CreativeWork
+from .creative_work_py3 import CreativeWork
 
 
 class Recipe(CreativeWork):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recognized_entity_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recognized_entity_py3.py
index cdaa8c0cd3c3..baf7784b3792 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recognized_entity_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recognized_entity_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 
 
 class RecognizedEntity(Response):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recognized_entity_region_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recognized_entity_region_py3.py
index 70626031a667..64828a094315 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recognized_entity_region_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/recognized_entity_region_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 
 
 class RecognizedEntityRegion(Response):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/response_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/response_py3.py
index 85528bfc91e5..7f8eb1a294e0 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/response_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/response_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .identifiable import Identifiable
+from .identifiable_py3 import Identifiable
 
 
 class Response(Identifiable):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/search_results_answer_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/search_results_answer_py3.py
index f0bb1b5cf65b..e972b77c2ea7 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/search_results_answer_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/search_results_answer_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .answer import Answer
+from .answer_py3 import Answer
 
 
 class SearchResultsAnswer(Answer):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/structured_value_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/structured_value_py3.py
index 9d8b26aad49f..a355b311fd89 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/structured_value_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/structured_value_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .intangible import Intangible
+from .intangible_py3 import Intangible
 
 
 class StructuredValue(Intangible):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/thing_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/thing_py3.py
index 2a6cc114063c..d26edd9565e6 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/thing_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/thing_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 
 
 class Thing(Response):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/trending_images_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/trending_images_py3.py
index 9831a7d14339..a12627c54bc5 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/trending_images_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/trending_images_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 
 
 class TrendingImages(Response):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/web_page_py3.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/web_page_py3.py
index 50c8d7b02f23..70444dffb657 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/web_page_py3.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/models/web_page_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .creative_work import CreativeWork
+from .creative_work_py3 import CreativeWork
 
 
 class WebPage(CreativeWork):
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/operations/images_operations.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/operations/images_operations.py
index b23a2db51cb1..003844cddaa8 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/operations/images_operations.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/operations/images_operations.py
@@ -411,6 +411,10 @@ def search(
         """
         # Construct URL
         url = self.search.metadata['url']
+        path_format_arguments = {
+            'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True)
+        }
+        url = self._client.format_url(url, **path_format_arguments)
 
         # Construct parameters
         query_parameters = {}
@@ -462,7 +466,7 @@ def search(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if custom_headers:
             header_parameters.update(custom_headers)
         header_parameters['X-BingApis-SDK'] = self._serialize.header("self.x_bing_apis_sdk", self.x_bing_apis_sdk, 'str')
@@ -478,8 +482,8 @@ def search(
             header_parameters['X-Search-Location'] = self._serialize.header("location", location, 'str')
 
         # Construct and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             raise models.ErrorResponseException(self._deserialize, response)
@@ -828,6 +832,10 @@ def details(
         """
         # Construct URL
         url = self.details.metadata['url']
+        path_format_arguments = {
+            'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True)
+        }
+        url = self._client.format_url(url, **path_format_arguments)
 
         # Construct parameters
         query_parameters = {}
@@ -861,7 +869,7 @@ def details(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if custom_headers:
             header_parameters.update(custom_headers)
         header_parameters['X-BingApis-SDK'] = self._serialize.header("self.x_bing_apis_sdk", self.x_bing_apis_sdk, 'str')
@@ -879,8 +887,8 @@ def details(
             header_parameters['X-Search-Location'] = self._serialize.header("location", location, 'str')
 
         # Construct and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             raise models.ErrorResponseException(self._deserialize, response)
@@ -1111,6 +1119,10 @@ def trending(
         """
         # Construct URL
         url = self.trending.metadata['url']
+        path_format_arguments = {
+            'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True)
+        }
+        url = self._client.format_url(url, **path_format_arguments)
 
         # Construct parameters
         query_parameters = {}
@@ -1125,7 +1137,7 @@ def trending(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if custom_headers:
             header_parameters.update(custom_headers)
         header_parameters['X-BingApis-SDK'] = self._serialize.header("self.x_bing_apis_sdk", self.x_bing_apis_sdk, 'str')
@@ -1141,8 +1153,8 @@ def trending(
             header_parameters['X-Search-Location'] = self._serialize.header("location", location, 'str')
 
         # Construct and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             raise models.ErrorResponseException(self._deserialize, response)
diff --git a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/version.py b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/version.py
index a39916c162ce..63d89bfb54fa 100644
--- a/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/version.py
+++ b/azure-cognitiveservices-search-imagesearch/azure/cognitiveservices/search/imagesearch/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.0.0"
+VERSION = "1.0"
 
diff --git a/azure-cognitiveservices-search-imagesearch/setup.py b/azure-cognitiveservices-search-imagesearch/setup.py
index a2bd4197c30b..549d29c99265 100644
--- a/azure-cognitiveservices-search-imagesearch/setup.py
+++ b/azure-cognitiveservices-search-imagesearch/setup.py
@@ -79,6 +79,7 @@
     ]),
     install_requires=[
         'msrest>=0.5.0',
+        'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
     ],
     extras_require={