diff --git a/sdk/search/azure-search/src/main/java/com/azure/search/SearchServiceAsyncClient.java b/sdk/search/azure-search/src/main/java/com/azure/search/SearchServiceAsyncClient.java
index 44682210d7b2e..aceb223ffdc94 100644
--- a/sdk/search/azure-search/src/main/java/com/azure/search/SearchServiceAsyncClient.java
+++ b/sdk/search/azure-search/src/main/java/com/azure/search/SearchServiceAsyncClient.java
@@ -1294,7 +1294,8 @@ Mono<Response<Boolean>> skillsetExistsWithResponse(String skillsetName,
      * @return the created {@link SynonymMap}.
      */
     public Mono<SynonymMap> createSynonymMap(SynonymMap synonymMap) {
-        return this.createSynonymMapWithResponse(synonymMap, null).map(Response::getValue);
+        return this.createSynonymMapWithResponse(synonymMap, null)
+            .map(Response::getValue);
     }
 
     /**
@@ -1306,7 +1307,8 @@ public Mono<SynonymMap> createSynonymMap(SynonymMap synonymMap) {
      * @return the created {@link SynonymMap}.
      */
     public Mono<SynonymMap> createSynonymMap(SynonymMap synonymMap, RequestOptions requestOptions) {
-        return this.createSynonymMapWithResponse(synonymMap, requestOptions).map(Response::getValue);
+        return this.createSynonymMapWithResponse(synonymMap, requestOptions)
+            .map(Response::getValue);
     }
 
     /**
@@ -1319,7 +1321,7 @@ public Mono<SynonymMap> createSynonymMap(SynonymMap synonymMap, RequestOptions r
      */
     public Mono<Response<SynonymMap>> createSynonymMapWithResponse(SynonymMap synonymMap,
                                                                    RequestOptions requestOptions) {
-        return withContext(context -> createSynonymMapWithResponse(synonymMap,
+        return withContext(context -> this.createSynonymMapWithResponse(synonymMap,
             requestOptions,
             context));
     }
@@ -1367,7 +1369,7 @@ public Mono<SynonymMap> getSynonymMap(String synonymMapName, RequestOptions requ
      */
     public Mono<Response<SynonymMap>> getSynonymMapWithResponse(String synonymMapName,
                                                                 RequestOptions requestOptions) {
-        return withContext(context -> getSynonymMapWithResponse(synonymMapName, requestOptions, context));
+        return withContext(context -> this.getSynonymMapWithResponse(synonymMapName, requestOptions, context));
     }
 
     Mono<Response<SynonymMap>> getSynonymMapWithResponse(String synonymMapName,
@@ -1388,18 +1390,6 @@ public PagedFlux<SynonymMap> listSynonymMaps() {
         return this.listSynonymMaps(null, null);
     }
 
-    /**
-     * Lists all synonym maps available for an Azure Cognitive Search service.
-     *
-     * @param select selects which top-level properties of the synonym maps to retrieve.
-     * Specified as a comma-separated list of JSON property names, or '*' for all properties.
-     * The default is all properties
-     * @return a reactive response emitting the list of synonym maps.
-     */
-    public PagedFlux<SynonymMap> listSynonymMaps(String select) {
-        return this.listSynonymMaps(select, null);
-    }
-
     /**
      * Lists all synonym maps available for an Azure Cognitive Search service.
      *
@@ -1416,12 +1406,6 @@ public PagedFlux<SynonymMap> listSynonymMaps(String select, RequestOptions reque
             nextLink -> Mono.empty());
     }
 
-    PagedFlux<SynonymMap> listSynonymMaps(String select, RequestOptions requestOptions, Context context) {
-        return new PagedFlux<>(
-            () -> this.listSynonymMapsWithResponse(select, requestOptions, context),
-            nextLink -> Mono.empty());
-    }
-
     /**
      * Lists all synonym maps available for an Azure Cognitive Search service.
      *
@@ -1463,19 +1447,6 @@ public Mono<SynonymMap> createOrUpdateSynonymMap(SynonymMap synonymMap) {
             .map(Response::getValue);
     }
 
-    /**
-     * Creates a new Azure Cognitive Search synonym map or updates a synonym map if it already exists.
-     *
-     * @param synonymMap the definition of the synonym map to create or update
-     * @param accessCondition the condition where the operation will be performed if the ETag on the server matches or
-     * doesn't match specified values
-     * @return the synonym map that was created or updated.
-     */
-    public Mono<SynonymMap> createOrUpdateSynonymMap(SynonymMap synonymMap, AccessCondition accessCondition) {
-        return this.createOrUpdateSynonymMapWithResponse(synonymMap, accessCondition, null)
-            .map(Response::getValue);
-    }
-
     /**
      * Creates a new Azure Cognitive Search synonym map or updates a synonym map if it already exists.
      *
@@ -1506,10 +1477,8 @@ public Mono<SynonymMap> createOrUpdateSynonymMap(SynonymMap synonymMap,
     public Mono<Response<SynonymMap>> createOrUpdateSynonymMapWithResponse(SynonymMap synonymMap,
                                                                            AccessCondition accessCondition,
                                                                            RequestOptions requestOptions) {
-        return withContext(context -> createOrUpdateSynonymMapWithResponse(synonymMap,
-            accessCondition,
-            requestOptions,
-            context));
+        return withContext(context -> this.createOrUpdateSynonymMapWithResponse(synonymMap,
+            accessCondition, requestOptions, context));
     }
 
     Mono<Response<SynonymMap>> createOrUpdateSynonymMapWithResponse(SynonymMap synonymMap,
@@ -1536,18 +1505,6 @@ public Mono<Void> deleteSynonymMap(String synonymMapName) {
         return this.deleteSynonymMap(synonymMapName, null, null);
     }
 
-    /**
-     * Deletes an Azure Cognitive Search synonym map.
-     *
-     * @param synonymMapName the name of the synonym map to delete
-     * @param accessCondition the condition where the operation will be performed if the ETag on the server matches or
-     * doesn't match specified values
-     * @return a response signalling completion.
-     */
-    public Mono<Void> deleteSynonymMap(String synonymMapName, AccessCondition accessCondition) {
-        return this.deleteSynonymMap(synonymMapName, accessCondition, null);
-    }
-
     /**
      * Deletes an Azure Cognitive Search synonym map.
      *
diff --git a/sdk/search/azure-search/src/main/java/com/azure/search/SearchServiceClient.java b/sdk/search/azure-search/src/main/java/com/azure/search/SearchServiceClient.java
index 57d6da3d3eb42..5173928d16da4 100644
--- a/sdk/search/azure-search/src/main/java/com/azure/search/SearchServiceClient.java
+++ b/sdk/search/azure-search/src/main/java/com/azure/search/SearchServiceClient.java
@@ -1158,19 +1158,6 @@ public SynonymMap createSynonymMap(SynonymMap synonymMap, RequestOptions request
         return asyncClient.createSynonymMap(synonymMap, requestOptions).block();
     }
 
-    /**
-     * Creates a new Azure Cognitive Search synonym map.
-     *
-     * @param synonymMap the definition of the synonym map to create
-     * @param requestOptions additional parameters for the operation.
-     * Contains the tracking ID sent with the request to help with debugging
-     * @param context additional context that is passed through the HTTP pipeline during the service call
-     * @return the created {@link SynonymMap}.
-     */
-    public SynonymMap createSynonymMap(SynonymMap synonymMap, RequestOptions requestOptions, Context context) {
-        return this.createSynonymMapWithResponse(synonymMap, requestOptions, context).getValue();
-    }
-
     /**
      * Creates a new Azure Cognitive Search synonym map.
      *
@@ -1183,9 +1170,7 @@ public SynonymMap createSynonymMap(SynonymMap synonymMap, RequestOptions request
     public Response<SynonymMap> createSynonymMapWithResponse(SynonymMap synonymMap,
                                                              RequestOptions requestOptions,
                                                              Context context) {
-        return asyncClient.createSynonymMapWithResponse(synonymMap,
-            requestOptions,
-            context).block();
+        return asyncClient.createSynonymMapWithResponse(synonymMap, requestOptions, context).block();
     }
 
     /**
@@ -1210,21 +1195,6 @@ public SynonymMap getSynonymMap(String synonymMapName, RequestOptions requestOpt
         return asyncClient.getSynonymMap(synonymMapName, requestOptions).block();
     }
 
-    /**
-     * Retrieves a synonym map definition.
-     *
-     * @param synonymMapName name of the synonym map to retrieve
-     * @param requestOptions additional parameters for the operation.
-     * Contains the tracking ID sent with the request to help with debugging
-     * @param context a context that is passed through the HTTP pipeline during the service call
-     * @return the {@link SynonymMap} definition.
-     */
-    public SynonymMap getSynonymMap(String synonymMapName,
-                                    RequestOptions requestOptions,
-                                    Context context) {
-        return this.getSynonymMapWithResponse(synonymMapName, requestOptions, context).getValue();
-    }
-
     /**
      * Retrieves a synonym map definition.
      *
@@ -1249,18 +1219,6 @@ public PagedIterable<SynonymMap> listSynonymMaps() {
         return new PagedIterable<>(asyncClient.listSynonymMaps());
     }
 
-    /**
-     * Lists all synonym maps available for an Azure Cognitive Search service.
-     *
-     * @param select selects which top-level properties of the index definitions to retrieve.
-     * Specified as a comma-separated list of JSON property names, or '*' for all properties.
-     * The default is all properties
-     * @return the list of synonym maps.
-     */
-    public PagedIterable<SynonymMap> listSynonymMaps(String select) {
-        return new PagedIterable<>(asyncClient.listSynonymMaps(select));
-    }
-
     /**
      * Lists all synonym maps available for an Azure Cognitive Search service.
      *
@@ -1275,21 +1233,6 @@ public PagedIterable<SynonymMap> listSynonymMaps(String select, RequestOptions r
         return new PagedIterable<>(asyncClient.listSynonymMaps(select, requestOptions));
     }
 
-    /**
-     * Lists all synonym maps available for an Azure Cognitive Search service.
-     *
-     * @param select selects which top-level properties of the index definitions to retrieve.
-     * Specified as a comma-separated list of JSON property names, or '*' for all properties.
-     * The default is all properties
-     * @param requestOptions additional parameters for the operation.
-     * Contains the tracking ID sent with the request to help with debugging
-     * @param context additional context that is passed through the HTTP pipeline during the service call
-     * @return the list of synonym maps.
-     */
-    public PagedIterable<SynonymMap> listSynonymMaps(String select, RequestOptions requestOptions, Context context) {
-        return new PagedIterable<>(asyncClient.listSynonymMaps(select, requestOptions, context));
-    }
-
     /**
      * Lists all synonym maps available for an Azure Cognitive Search service.
      *
@@ -1316,18 +1259,6 @@ public SynonymMap createOrUpdateSynonymMap(SynonymMap synonymMap) {
         return asyncClient.createOrUpdateSynonymMap(synonymMap).block();
     }
 
-    /**
-     * Creates a new Azure Cognitive Search synonym map or updates a synonym map if it already exists.
-     *
-     * @param synonymMap the definition of the synonym map to create or update
-     * @param accessCondition the condition where the operation will be performed if the ETag on the server matches or
-     * doesn't match specified values
-     * @return the synonym map that was created or updated.
-     */
-    public SynonymMap createOrUpdateSynonymMap(SynonymMap synonymMap, AccessCondition accessCondition) {
-        return asyncClient.createOrUpdateSynonymMap(synonymMap, accessCondition).block();
-    }
-
     /**
      * Creates a new Azure Cognitive Search synonym map or updates a synonym map if it already exists.
      *
@@ -1341,30 +1272,7 @@ public SynonymMap createOrUpdateSynonymMap(SynonymMap synonymMap, AccessConditio
     public SynonymMap createOrUpdateSynonymMap(SynonymMap synonymMap,
                                                AccessCondition accessCondition,
                                                RequestOptions requestOptions) {
-        return asyncClient.createOrUpdateSynonymMap(synonymMap,
-            accessCondition,
-            requestOptions).block();
-    }
-
-    /**
-     * Creates a new Azure Cognitive Search synonym map or updates a synonym map if it already exists.
-     *
-     * @param synonymMap the definition of the synonym map to create or update
-     * @param accessCondition the condition where the operation will be performed if the ETag on the server matches or
-     * doesn't match specified values
-     * @param requestOptions additional parameters for the operation.
-     * Contains the tracking ID sent with the request to help with debugging
-     * @param context additional context that is passed through the HTTP pipeline during the service call
-     * @return the synonym map that was created or updated.
-     */
-    public SynonymMap createOrUpdateSynonymMap(SynonymMap synonymMap,
-                                               AccessCondition accessCondition,
-                                               RequestOptions requestOptions,
-                                               Context context) {
-        return this.createOrUpdateSynonymMapWithResponse(synonymMap,
-            accessCondition,
-            requestOptions,
-            context).getValue();
+        return asyncClient.createOrUpdateSynonymMap(synonymMap, accessCondition, requestOptions).block();
     }
 
     /**
@@ -1383,9 +1291,7 @@ public Response<SynonymMap> createOrUpdateSynonymMapWithResponse(SynonymMap syno
                                                                      RequestOptions requestOptions,
                                                                      Context context) {
         return asyncClient.createOrUpdateSynonymMapWithResponse(synonymMap,
-            accessCondition,
-            requestOptions,
-            context).block();
+            accessCondition, requestOptions, context).block();
     }
 
     /**
@@ -1397,17 +1303,6 @@ public void deleteSynonymMap(String synonymMapName) {
         asyncClient.deleteSynonymMap(synonymMapName).block();
     }
 
-    /**
-     * Deletes an Azure Cognitive Search synonym map.
-     *
-     * @param synonymMapName the name of the synonym map to delete
-     * @param accessCondition the condition where the operation will be performed if the ETag on the server matches or
-     * doesn't match specified values
-     */
-    public void deleteSynonymMap(String synonymMapName, AccessCondition accessCondition) {
-        asyncClient.deleteSynonymMap(synonymMapName, accessCondition).block();
-    }
-
     /**
      * Deletes an Azure Cognitive Search synonym map.
      *
@@ -1423,27 +1318,6 @@ public void deleteSynonymMap(String synonymMapName,
         asyncClient.deleteSynonymMap(synonymMapName, accessCondition, requestOptions).block();
     }
 
-    /**
-     * Deletes an Azure Cognitive Search synonym map.
-     *
-     * @param synonymMapName the name of the synonym map to delete
-     * @param accessCondition the condition where the operation will be performed if the ETag on the server matches or
-     * doesn't match specified values
-     * @param requestOptions additional parameters for the operation.
-     * Contains the tracking ID sent with the request to help with debugging
-     * @param context additional context that is passed through the Http pipeline during the service call
-     * Contains the tracking ID sent with the request to help with debugging
-     */
-    public void deleteSynonymMap(String synonymMapName,
-                                 AccessCondition accessCondition,
-                                 RequestOptions requestOptions,
-                                 Context context) {
-        this.deleteSynonymMapWithResponse(synonymMapName,
-            accessCondition,
-            requestOptions,
-            context);
-    }
-
     /**
      * Deletes an Azure Cognitive Search synonym map.
      *
@@ -1460,9 +1334,7 @@ public Response<Void> deleteSynonymMapWithResponse(String synonymMapName,
                                                        RequestOptions requestOptions,
                                                        Context context) {
         return asyncClient.deleteSynonymMapWithResponse(synonymMapName,
-            accessCondition,
-            requestOptions,
-            context).block();
+            accessCondition, requestOptions, context).block();
     }
 
     /**
@@ -1487,20 +1359,6 @@ public Boolean synonymMapExists(String synonymMapName, RequestOptions requestOpt
         return asyncClient.synonymMapExists(synonymMapName, requestOptions).block();
     }
 
-    /**
-     * Determines whether or not the given synonym map exists.
-     *
-     * @param synonymMapName the name of the synonym map
-     * @param requestOptions additional parameters for the operation.
-     * Contains the tracking ID sent with the request to help with debugging
-     * @param context additional context that is passed through the HTTP pipeline during the service call
-     * @return true if the synonym map exists; false otherwise.
-     */
-    public Boolean synonymMapExists(String synonymMapName, RequestOptions requestOptions, Context context) {
-        return this.synonymMapExistsWithResponse(synonymMapName, requestOptions, context)
-            .getValue();
-    }
-
     /**
      * Determines whether or not the given synonym map exists.
      *
@@ -1514,7 +1372,6 @@ public Response<Boolean> synonymMapExistsWithResponse(String synonymMapName,
                                                           RequestOptions requestOptions,
                                                           Context context) {
         return asyncClient
-            .synonymMapExistsWithResponse(synonymMapName, requestOptions, context)
-            .block();
+            .synonymMapExistsWithResponse(synonymMapName, requestOptions, context).block();
     }
 }
diff --git a/sdk/search/azure-search/src/test/java/com/azure/search/SynonymMapManagementAsyncTests.java b/sdk/search/azure-search/src/test/java/com/azure/search/SynonymMapManagementAsyncTests.java
index 5178a7e8a4997..2f53bf28981bf 100644
--- a/sdk/search/azure-search/src/test/java/com/azure/search/SynonymMapManagementAsyncTests.java
+++ b/sdk/search/azure-search/src/test/java/com/azure/search/SynonymMapManagementAsyncTests.java
@@ -7,15 +7,12 @@
 import com.azure.core.http.rest.PagedFlux;
 import com.azure.core.http.rest.Response;
 import com.azure.search.models.AccessCondition;
-import com.azure.search.models.RequestOptions;
 import com.azure.search.models.SynonymMap;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import org.junit.Assert;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.util.UUID;
-
 public class SynonymMapManagementAsyncTests extends SynonymMapManagementTestBase {
     private SearchServiceAsyncClient client;
 
@@ -59,21 +56,18 @@ public void getSynonymMapReturnsCorrectDefinition() {
         SynonymMap expected = createTestSynonymMap();
         client.createSynonymMap(expected).block();
 
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
-
         StepVerifier
             .create(client.getSynonymMap(expected.getName()))
             .assertNext(actual -> assertSynonymMapsEqual(expected, actual))
             .verifyComplete();
 
         StepVerifier
-            .create(client.getSynonymMap(expected.getName(), requestOptions))
+            .create(client.getSynonymMap(expected.getName(), generateRequestOptions()))
             .assertNext(actual -> assertSynonymMapsEqual(expected, actual))
             .verifyComplete();
 
         StepVerifier
-            .create(client.getSynonymMapWithResponse(expected.getName(), requestOptions))
+            .create(client.getSynonymMapWithResponse(expected.getName(), generateRequestOptions()))
             .assertNext(result -> assertSynonymMapsEqual(expected, result.getValue()))
             .verifyComplete();
     }
@@ -83,9 +77,6 @@ public void getSynonymMapThrowsOnNotFound() {
         final String synonymMapName = "thisSynonymMapDoesNotExist";
         final String exceptionMessage = String.format("No synonym map with the name '%s' was found", synonymMapName);
 
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
-
         StepVerifier
             .create(client.getSynonymMap(synonymMapName))
             .verifyErrorSatisfies(error -> {
@@ -96,7 +87,7 @@ public void getSynonymMapThrowsOnNotFound() {
             });
 
         StepVerifier
-            .create(client.getSynonymMap(synonymMapName, requestOptions))
+            .create(client.getSynonymMap(synonymMapName, generateRequestOptions()))
             .verifyErrorSatisfies(error -> {
                 Assert.assertEquals(HttpResponseException.class, error.getClass());
                 Assert.assertEquals(HttpResponseStatus.NOT_FOUND.code(),
@@ -105,7 +96,7 @@ public void getSynonymMapThrowsOnNotFound() {
             });
 
         StepVerifier
-            .create(client.getSynonymMapWithResponse(synonymMapName, requestOptions))
+            .create(client.getSynonymMapWithResponse(synonymMapName, generateRequestOptions()))
             .verifyErrorSatisfies(error -> {
                 Assert.assertEquals(HttpResponseException.class, error.getClass());
                 Assert.assertEquals(HttpResponseStatus.NOT_FOUND.code(),
@@ -137,9 +128,6 @@ public void canUpdateSynonymMap() {
     public void createOrUpdateSynonymMapCreatesWhenSynonymMapDoesNotExist() {
         SynonymMap expected = createTestSynonymMap();
 
-        RequestOptions requestOptions = new RequestOptions()
-                .setClientRequestId(UUID.randomUUID());
-
         StepVerifier
             .create(client.createOrUpdateSynonymMap(expected))
             .assertNext(res -> assertSynonymMapsEqual(expected, res))
@@ -147,13 +135,13 @@ public void createOrUpdateSynonymMapCreatesWhenSynonymMapDoesNotExist() {
 
         StepVerifier
             .create(client.createOrUpdateSynonymMap(expected.setName("test-synonym1"),
-                new AccessCondition(), requestOptions))
+                new AccessCondition(), generateRequestOptions()))
             .assertNext(res -> assertSynonymMapsEqual(expected, res))
             .verifyComplete();
 
         StepVerifier
             .create(client.createOrUpdateSynonymMapWithResponse(expected.setName("test-synonym2"),
-                new AccessCondition(), requestOptions))
+                new AccessCondition(), generateRequestOptions()))
             .assertNext(res -> {
                 Assert.assertEquals(HttpResponseStatus.CREATED.code(), res.getStatusCode());
                 assertSynonymMapsEqual(expected, res.getValue());
@@ -166,25 +154,18 @@ public void createOrUpdateSynonymMapIfNotExistsFailsOnExistingResource() {
         SynonymMap synonymMap = createTestSynonymMap();
         SynonymMap createdResource = client.createOrUpdateSynonymMap(synonymMap).block();
         SynonymMap mutatedResource = mutateSynonymsInSynonymMap(createdResource);
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
 
         StepVerifier
-            .create(client.createOrUpdateSynonymMap(mutatedResource, generateIfNotExistsAccessCondition()))
+            .create(client.createOrUpdateSynonymMap(mutatedResource,
+                generateIfNotExistsAccessCondition(), generateRequestOptions()))
             .verifyErrorSatisfies(error -> {
                 Assert.assertEquals(HttpResponseException.class, error.getClass());
                 Assert.assertEquals(HttpResponseStatus.PRECONDITION_FAILED.code(), ((HttpResponseException) error).getResponse().getStatusCode());
             });
 
         StepVerifier
-            .create(client.createOrUpdateSynonymMap(mutatedResource, generateIfNotExistsAccessCondition(), requestOptions))
-            .verifyErrorSatisfies(error -> {
-                Assert.assertEquals(HttpResponseException.class, error.getClass());
-                Assert.assertEquals(HttpResponseStatus.PRECONDITION_FAILED.code(), ((HttpResponseException) error).getResponse().getStatusCode());
-            });
-
-        StepVerifier
-            .create(client.createOrUpdateSynonymMapWithResponse(mutatedResource, generateIfNotExistsAccessCondition(), requestOptions))
+            .create(client.createOrUpdateSynonymMapWithResponse(mutatedResource,
+                generateIfNotExistsAccessCondition(), generateRequestOptions()))
             .verifyErrorSatisfies(error -> {
                 Assert.assertEquals(HttpResponseException.class, error.getClass());
                 Assert.assertEquals(HttpResponseStatus.PRECONDITION_FAILED.code(), ((HttpResponseException) error).getResponse().getStatusCode());
@@ -194,21 +175,22 @@ public void createOrUpdateSynonymMapIfNotExistsFailsOnExistingResource() {
     @Override
     public void createOrUpdateSynonymMapIfNotExistsSucceedsOnNoResource() {
         SynonymMap resource = createTestSynonymMap();
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
 
         StepVerifier
-            .create(client.createOrUpdateSynonymMap(resource, generateIfNotExistsAccessCondition()))
+            .create(client.createOrUpdateSynonymMap(resource,
+                generateIfNotExistsAccessCondition(), generateRequestOptions()))
             .assertNext(res -> Assert.assertFalse(res.getETag().isEmpty()))
             .verifyComplete();
 
         StepVerifier
-            .create(client.createOrUpdateSynonymMap(resource.setName("test-synonym1"), generateIfNotExistsAccessCondition(), requestOptions))
+            .create(client.createOrUpdateSynonymMap(resource.setName("test-synonym1"),
+                generateIfNotExistsAccessCondition(), generateRequestOptions()))
             .assertNext(res -> Assert.assertFalse(res.getETag().isEmpty()))
             .verifyComplete();
 
         StepVerifier
-            .create(client.createOrUpdateSynonymMapWithResponse(resource.setName("test-synonym2"), generateIfNotExistsAccessCondition(), requestOptions))
+            .create(client.createOrUpdateSynonymMapWithResponse(resource.setName("test-synonym2"),
+                generateIfNotExistsAccessCondition(), generateRequestOptions()))
             .assertNext(res -> Assert.assertFalse(res.getValue().getETag().isEmpty()))
             .verifyComplete();
     }
@@ -218,7 +200,8 @@ public void createOrUpdateSynonymMapIfExistsSucceedsOnExistingResource() {
         SynonymMap synonymMap = createTestSynonymMap();
         SynonymMap createdResource = client.createOrUpdateSynonymMap(synonymMap).block();
         SynonymMap mutatedResource = mutateSynonymsInSynonymMap(createdResource);
-        Mono<SynonymMap> updatedResource = client.createOrUpdateSynonymMap(mutatedResource, generateIfExistsAccessCondition());
+        Mono<SynonymMap> updatedResource = client.createOrUpdateSynonymMap(mutatedResource,
+            generateIfExistsAccessCondition(), generateRequestOptions());
 
         StepVerifier
             .create(updatedResource)
@@ -234,7 +217,8 @@ public void createOrUpdateSynonymMapIfExistsFailsOnNoResource() {
         SynonymMap resource = createTestSynonymMap();
 
         StepVerifier
-            .create(client.createOrUpdateSynonymMap(resource, generateIfExistsAccessCondition()))
+            .create(client.createOrUpdateSynonymMap(resource,
+                generateIfExistsAccessCondition(), generateRequestOptions()))
             .verifyErrorSatisfies(error -> {
                 Assert.assertEquals(HttpResponseException.class, error.getClass());
                 Assert.assertEquals(HttpResponseStatus.PRECONDITION_FAILED.code(), ((HttpResponseException) error).getResponse().getStatusCode());
@@ -249,7 +233,8 @@ public void createOrUpdateSynonymMapIfNotChangedSucceedsWhenResourceUnchanged()
         SynonymMap synonymMap = createTestSynonymMap();
         SynonymMap createdResource = client.createOrUpdateSynonymMap(synonymMap).block();
         SynonymMap mutatedResource = mutateSynonymsInSynonymMap(createdResource);
-        Mono<SynonymMap> updatedResource = client.createOrUpdateSynonymMap(mutatedResource, generateIfMatchAccessCondition(createdResource.getETag()));
+        Mono<SynonymMap> updatedResource = client.createOrUpdateSynonymMap(mutatedResource,
+            generateIfMatchAccessCondition(createdResource.getETag()), generateRequestOptions());
 
         StepVerifier
             .create(updatedResource)
@@ -269,7 +254,8 @@ public void createOrUpdateSynonymMapIfNotChangedFailsWhenResourceChanged() {
         SynonymMap updatedResource = client.createOrUpdateSynonymMap(mutatedResource).block();
 
         StepVerifier
-            .create(client.createOrUpdateSynonymMap(updatedResource, generateIfMatchAccessCondition(createdResource.getETag())))
+            .create(client.createOrUpdateSynonymMap(updatedResource,
+                generateIfMatchAccessCondition(createdResource.getETag()), generateRequestOptions()))
             .verifyErrorSatisfies(error -> {
                 Assert.assertEquals(HttpResponseException.class, error.getClass());
                 Assert.assertEquals(HttpResponseStatus.PRECONDITION_FAILED.code(), ((HttpResponseException) error).getResponse().getStatusCode());
@@ -286,7 +272,8 @@ public void deleteSynonymMapIfNotChangedWorksOnlyOnCurrentResource() {
         SynonymMap currentResource = client.createOrUpdateSynonymMap(staleResource.setSynonyms("updatedword1,updatedword2")).block();
 
         StepVerifier
-            .create(client.deleteSynonymMap(synonymMap.getName(), generateIfMatchAccessCondition(staleResource.getETag())))
+            .create(client.deleteSynonymMap(synonymMap.getName(),
+                generateIfMatchAccessCondition(staleResource.getETag()), generateRequestOptions()))
             .verifyErrorSatisfies(error -> {
                 Assert.assertEquals(HttpResponseException.class, error.getClass());
                 Assert.assertEquals(HttpResponseStatus.PRECONDITION_FAILED.code(), ((HttpResponseException) error).getResponse().getStatusCode());
@@ -305,9 +292,9 @@ public void deleteSynonymMapIfExistsWorksOnlyWhenResourceExists() {
         SynonymMap synonymMap = createTestSynonymMap();
         client.createSynonymMap(synonymMap).block();
 
-        client.deleteSynonymMap(synonymMap.getName(), generateIfExistsAccessCondition()).block();
+        client.deleteSynonymMap(synonymMap.getName(), generateIfExistsAccessCondition(), generateRequestOptions()).block();
         StepVerifier
-            .create(client.deleteSynonymMap(synonymMap.getName(), generateIfExistsAccessCondition()))
+            .create(client.deleteSynonymMap(synonymMap.getName(), generateIfExistsAccessCondition(), generateRequestOptions()))
             .verifyErrorSatisfies(error -> {
                 Assert.assertEquals(HttpResponseException.class, error.getClass());
                 Assert.assertEquals(HttpResponseStatus.PRECONDITION_FAILED.code(), ((HttpResponseException) error).getResponse().getStatusCode());
@@ -366,10 +353,7 @@ public void canCreateAndListSynonymMaps() {
             })
             .verifyComplete();
 
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
-
-        listResponse = client.listSynonymMaps("name", requestOptions);
+        listResponse = client.listSynonymMaps("name", generateRequestOptions());
 
         StepVerifier
             .create(listResponse.collectList())
@@ -382,7 +366,7 @@ public void canCreateAndListSynonymMaps() {
             .verifyComplete();
 
         StepVerifier
-            .create(client.listSynonymMapsWithResponse("name", requestOptions))
+            .create(client.listSynonymMapsWithResponse("name", generateRequestOptions()))
             .assertNext(result -> {
                 Assert.assertEquals(2, result.getItems().size());
                 Assert.assertEquals(synonymMap1.getName(), result.getValue().get(0).getName());
@@ -399,7 +383,7 @@ public void canListSynonymMapsWithSelectedField() {
         client.createSynonymMap(synonymMap1).block();
         client.createSynonymMap(synonymMap2).block();
 
-        PagedFlux<SynonymMap> selectedFieldListResponse = client.listSynonymMaps("name");
+        PagedFlux<SynonymMap> selectedFieldListResponse = client.listSynonymMaps("name", generateRequestOptions());
 
         StepVerifier
             .create(selectedFieldListResponse.collectList())
@@ -426,9 +410,6 @@ public void canListSynonymMapsWithSelectedField() {
     public void existsReturnsTrueForExistingSynonymMap() {
         SynonymMap synonymMap = createTestSynonymMap();
 
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
-
         client.createSynonymMap(synonymMap).block();
 
         StepVerifier
@@ -437,12 +418,12 @@ public void existsReturnsTrueForExistingSynonymMap() {
             .verifyComplete();
 
         StepVerifier
-            .create(client.synonymMapExists(synonymMap.getName(), requestOptions))
+            .create(client.synonymMapExists(synonymMap.getName(), generateRequestOptions()))
             .assertNext(res -> Assert.assertTrue(res))
             .verifyComplete();
 
         StepVerifier
-            .create(client.synonymMapExistsWithResponse(synonymMap.getName(), requestOptions))
+            .create(client.synonymMapExistsWithResponse(synonymMap.getName(), generateRequestOptions()))
             .assertNext(res -> Assert.assertTrue(res.getValue()))
             .verifyComplete();
     }
@@ -451,21 +432,18 @@ public void existsReturnsTrueForExistingSynonymMap() {
     public void existsReturnsFalseForNonExistingSynonymMap() {
         String synonymMapName = "thisSynonymMapDoesNotExist";
 
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
-
         StepVerifier
             .create(client.synonymMapExists(synonymMapName))
             .assertNext(res -> Assert.assertFalse(res))
             .verifyComplete();
 
         StepVerifier
-            .create(client.synonymMapExists(synonymMapName, requestOptions))
+            .create(client.synonymMapExists(synonymMapName, generateRequestOptions()))
             .assertNext(res -> Assert.assertFalse(res))
             .verifyComplete();
 
         StepVerifier
-            .create(client.synonymMapExistsWithResponse(synonymMapName, requestOptions))
+            .create(client.synonymMapExistsWithResponse(synonymMapName, generateRequestOptions()))
             .assertNext(res -> Assert.assertFalse(res.getValue()))
             .verifyComplete();
     }
diff --git a/sdk/search/azure-search/src/test/java/com/azure/search/SynonymMapManagementSyncTests.java b/sdk/search/azure-search/src/test/java/com/azure/search/SynonymMapManagementSyncTests.java
index a6b24d2941352..5a971d264af09 100644
--- a/sdk/search/azure-search/src/test/java/com/azure/search/SynonymMapManagementSyncTests.java
+++ b/sdk/search/azure-search/src/test/java/com/azure/search/SynonymMapManagementSyncTests.java
@@ -8,12 +8,10 @@
 import com.azure.core.util.Context;
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.search.models.AccessCondition;
-import com.azure.search.models.RequestOptions;
 import com.azure.search.models.SynonymMap;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import org.junit.Assert;
 
-import java.util.UUID;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -57,18 +55,15 @@ public void getSynonymMapReturnsCorrectDefinition() {
 
         client.createSynonymMap(expected);
 
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
-
         Context context = new Context("key", "value");
 
         SynonymMap actual = client.getSynonymMap(expected.getName());
         assertSynonymMapsEqual(expected, actual);
 
-        actual = client.getSynonymMap(expected.getName(), requestOptions);
+        actual = client.getSynonymMap(expected.getName(), generateRequestOptions());
         assertSynonymMapsEqual(expected, actual);
 
-        actual = client.getSynonymMapWithResponse(expected.getName(), requestOptions, context)
+        actual = client.getSynonymMapWithResponse(expected.getName(), generateRequestOptions(), context)
             .getValue();
         assertSynonymMapsEqual(expected, actual);
 
@@ -79,17 +74,12 @@ public void getSynonymMapReturnsCorrectDefinition() {
     public void getSynonymMapThrowsOnNotFound() {
         final String synonymMapName = "thisSynonymMapDoesNotExist";
 
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
-
         Context context = new Context("key", "value");
 
         validateSynonymMapNotFoundThrowsException(synonymMapName, () -> client.getSynonymMap(synonymMapName));
-        validateSynonymMapNotFoundThrowsException(synonymMapName, () -> client.getSynonymMap(synonymMapName, requestOptions));
-        validateSynonymMapNotFoundThrowsException(synonymMapName, () -> client.getSynonymMap(synonymMapName,
-            requestOptions, context));
+        validateSynonymMapNotFoundThrowsException(synonymMapName, () -> client.getSynonymMap(synonymMapName, generateRequestOptions()));
         validateSynonymMapNotFoundThrowsException(synonymMapName, () -> client.getSynonymMapWithResponse(synonymMapName,
-            requestOptions, context));
+            generateRequestOptions(), context));
     }
 
     @Override
@@ -112,22 +102,18 @@ public void canUpdateSynonymMap() {
     @Override
     public void createOrUpdateSynonymMapCreatesWhenSynonymMapDoesNotExist() {
         SynonymMap expected = createTestSynonymMap();
-
-        RequestOptions requestOptions = new RequestOptions()
-                .setClientRequestId(UUID.randomUUID());
-
         Context context = new Context("key", "value");
 
         SynonymMap actual = client.createOrUpdateSynonymMap(expected);
         assertSynonymMapsEqual(expected, actual);
 
         actual = client.createOrUpdateSynonymMap(expected.setName("test-synonym1"),
-            new AccessCondition(), requestOptions);
+            new AccessCondition(), generateRequestOptions());
         assertSynonymMapsEqual(expected, actual);
 
         Response<SynonymMap> createOrUpdateResponse = client.createOrUpdateSynonymMapWithResponse(
             expected.setName("test-synonym2"),
-            new AccessCondition(), requestOptions, context);
+            new AccessCondition(), generateRequestOptions(), context);
         Assert.assertEquals(HttpResponseStatus.CREATED.code(), createOrUpdateResponse.getStatusCode());
         assertSynonymMapsEqual(expected, createOrUpdateResponse.getValue());
     }
@@ -137,20 +123,10 @@ public void createOrUpdateSynonymMapIfNotExistsFailsOnExistingResource() {
         SynonymMap synonymMap = createTestSynonymMap();
         SynonymMap createdResource = client.createOrUpdateSynonymMap(synonymMap);
         SynonymMap mutatedResource = mutateSynonymsInSynonymMap(createdResource);
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
         Context context = new Context("key", "value");
 
         try {
-            client.createOrUpdateSynonymMap(mutatedResource, generateIfNotExistsAccessCondition());
-            Assert.fail("createOrUpdateSynonymMap did not throw an expected Exception");
-        } catch (Exception ex) {
-            Assert.assertEquals(HttpResponseException.class, ex.getClass());
-            Assert.assertEquals(HttpResponseStatus.PRECONDITION_FAILED.code(), ((HttpResponseException) ex).getResponse().getStatusCode());
-        }
-
-        try {
-            client.createOrUpdateSynonymMap(mutatedResource, generateIfNotExistsAccessCondition(), requestOptions);
+            client.createOrUpdateSynonymMap(mutatedResource, generateIfNotExistsAccessCondition(), generateRequestOptions());
             Assert.fail("createOrUpdateSynonymMap did not throw an expected Exception");
         } catch (Exception ex) {
             Assert.assertEquals(HttpResponseException.class, ex.getClass());
@@ -158,15 +134,7 @@ public void createOrUpdateSynonymMapIfNotExistsFailsOnExistingResource() {
         }
 
         try {
-            client.createOrUpdateSynonymMap(mutatedResource, generateIfNotExistsAccessCondition(), requestOptions, context);
-            Assert.fail("createOrUpdateSynonymMap did not throw an expected Exception");
-        } catch (Exception ex) {
-            Assert.assertEquals(HttpResponseException.class, ex.getClass());
-            Assert.assertEquals(HttpResponseStatus.PRECONDITION_FAILED.code(), ((HttpResponseException) ex).getResponse().getStatusCode());
-        }
-
-        try {
-            client.createOrUpdateSynonymMapWithResponse(mutatedResource, generateIfNotExistsAccessCondition(), requestOptions, context);
+            client.createOrUpdateSynonymMapWithResponse(mutatedResource, generateIfNotExistsAccessCondition(), generateRequestOptions(), context);
             Assert.fail("createOrUpdateSynonymMap did not throw an expected Exception");
         } catch (Exception ex) {
             Assert.assertEquals(HttpResponseException.class, ex.getClass());
@@ -177,22 +145,17 @@ public void createOrUpdateSynonymMapIfNotExistsFailsOnExistingResource() {
     @Override
     public void createOrUpdateSynonymMapIfNotExistsSucceedsOnNoResource() {
         SynonymMap resource = createTestSynonymMap();
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
         Context context = new Context("key", "value");
 
-        SynonymMap updatedResource = client.createOrUpdateSynonymMap(resource, generateIfNotExistsAccessCondition());
+        SynonymMap updatedResource = client.createOrUpdateSynonymMap(resource, generateIfNotExistsAccessCondition(), generateRequestOptions());
         Assert.assertFalse(updatedResource.getETag().isEmpty());
 
         updatedResource = client.createOrUpdateSynonymMap(resource.setName("test-synonym1"),
-            generateIfNotExistsAccessCondition(),
-            requestOptions);
+            generateIfNotExistsAccessCondition(), generateRequestOptions());
         Assert.assertFalse(updatedResource.getETag().isEmpty());
 
         Response<SynonymMap> updatedResponse = client.createOrUpdateSynonymMapWithResponse(resource.setName("test-synonym2"),
-            generateIfNotExistsAccessCondition(),
-            requestOptions,
-            context);
+            generateIfNotExistsAccessCondition(), generateRequestOptions(), context);
         Assert.assertFalse(updatedResponse.getValue().getETag().isEmpty());
     }
 
@@ -201,7 +164,7 @@ public void createOrUpdateSynonymMapIfExistsSucceedsOnExistingResource() {
         SynonymMap synonymMap = createTestSynonymMap();
         SynonymMap createdResource = client.createOrUpdateSynonymMap(synonymMap);
         SynonymMap mutatedResource = mutateSynonymsInSynonymMap(createdResource);
-        SynonymMap updatedResource = client.createOrUpdateSynonymMap(mutatedResource, generateIfExistsAccessCondition());
+        SynonymMap updatedResource = client.createOrUpdateSynonymMap(mutatedResource, generateIfExistsAccessCondition(), generateRequestOptions());
 
         Assert.assertFalse(updatedResource.getETag().isEmpty());
         Assert.assertNotEquals(createdResource.getETag(), updatedResource.getETag());
@@ -212,7 +175,7 @@ public void createOrUpdateSynonymMapIfExistsFailsOnNoResource() {
         SynonymMap resource = createTestSynonymMap();
 
         try {
-            client.createOrUpdateSynonymMap(resource, generateIfExistsAccessCondition());
+            client.createOrUpdateSynonymMap(resource, generateIfExistsAccessCondition(), generateRequestOptions());
             Assert.fail("createOrUpdateSynonymMap did not throw an expected Exception");
         } catch (Exception ex) {
             Assert.assertEquals(HttpResponseException.class, ex.getClass());
@@ -227,7 +190,7 @@ public void createOrUpdateSynonymMapIfNotChangedSucceedsWhenResourceUnchanged()
         SynonymMap synonymMap = createTestSynonymMap();
         SynonymMap createdResource = client.createOrUpdateSynonymMap(synonymMap);
         SynonymMap mutatedResource = mutateSynonymsInSynonymMap(createdResource);
-        SynonymMap updatedResource = client.createOrUpdateSynonymMap(mutatedResource, generateIfMatchAccessCondition(createdResource.getETag()));
+        SynonymMap updatedResource = client.createOrUpdateSynonymMap(mutatedResource, generateIfMatchAccessCondition(createdResource.getETag()), generateRequestOptions());
 
         Assert.assertFalse(createdResource.getETag().isEmpty());
         Assert.assertFalse(updatedResource.getETag().isEmpty());
@@ -242,7 +205,7 @@ public void createOrUpdateSynonymMapIfNotChangedFailsWhenResourceChanged() {
         SynonymMap updatedResource = client.createOrUpdateSynonymMap(mutatedResource);
 
         try {
-            client.createOrUpdateSynonymMap(updatedResource, generateIfMatchAccessCondition(createdResource.getETag()));
+            client.createOrUpdateSynonymMap(updatedResource, generateIfMatchAccessCondition(createdResource.getETag()), generateRequestOptions());
             Assert.fail("createOrUpdateSynonymMap did not throw an expected Exception");
         } catch (Exception ex) {
             Assert.assertEquals(HttpResponseException.class, ex.getClass());
@@ -260,7 +223,7 @@ public void deleteSynonymMapIfNotChangedWorksOnlyOnCurrentResource() {
         SynonymMap currentResource = client.createOrUpdateSynonymMap(staleResource.setSynonyms("updatedword1,updatedword2"));
 
         try {
-            client.deleteSynonymMap(synonymMap.getName(), generateIfMatchAccessCondition(staleResource.getETag()));
+            client.deleteSynonymMap(synonymMap.getName(), generateIfMatchAccessCondition(staleResource.getETag()), generateRequestOptions());
             Assert.fail("deleteSynonym did not throw an expected Exception");
         } catch (Exception ex) {
             Assert.assertEquals(HttpResponseException.class, ex.getClass());
@@ -279,9 +242,9 @@ public void deleteSynonymMapIfExistsWorksOnlyWhenResourceExists() {
         SynonymMap synonymMap = createTestSynonymMap();
         client.createSynonymMap(synonymMap);
 
-        client.deleteSynonymMap(synonymMap.getName(), generateIfExistsAccessCondition());
+        client.deleteSynonymMap(synonymMap.getName(), generateIfExistsAccessCondition(), generateRequestOptions());
         try {
-            client.deleteSynonymMap(synonymMap.getName(), generateIfExistsAccessCondition());
+            client.deleteSynonymMap(synonymMap.getName(), generateIfExistsAccessCondition(), generateRequestOptions());
             Assert.fail("deleteSynonymMap did not throw an expected Exception");
         } catch (Exception ex) {
             Assert.assertEquals(HttpResponseException.class, ex.getClass());
@@ -320,10 +283,7 @@ public void canCreateAndListSynonymMaps() {
         Assert.assertEquals(synonymMap1.getName(), result.get(0).getName());
         Assert.assertEquals(synonymMap2.getName(), result.get(1).getName());
 
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
-
-        actual = client.listSynonymMaps("name", requestOptions);
+        actual = client.listSynonymMaps("name", generateRequestOptions());
         result = actual.stream().collect(Collectors.toList());
 
         Assert.assertEquals(2, result.size());
@@ -332,7 +292,7 @@ public void canCreateAndListSynonymMaps() {
 
         Context context = new Context("key", "value");
         PagedResponse<SynonymMap> listResponse = client.listSynonymMapsWithResponse("name",
-            requestOptions, context);
+            generateRequestOptions(), context);
         result = listResponse.getItems();
 
         Assert.assertEquals(2, result.size());
@@ -348,7 +308,7 @@ public void canListSynonymMapsWithSelectedField() {
         client.createSynonymMap(synonymMap1);
         client.createSynonymMap(synonymMap2);
 
-        PagedIterable<SynonymMap> listResponse = client.listSynonymMaps("name");
+        PagedIterable<SynonymMap> listResponse = client.listSynonymMaps("name", generateRequestOptions());
         List<SynonymMap> result = listResponse.stream().collect(Collectors.toList());
 
         result.forEach(res -> {
@@ -365,34 +325,24 @@ public void canListSynonymMapsWithSelectedField() {
     @Override
     public void existsReturnsTrueForExistingSynonymMap() {
         SynonymMap synonymMap = createTestSynonymMap();
-
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
         Context context = new Context("key", "value");
 
         client.createSynonymMap(synonymMap);
 
         Assert.assertTrue(client.synonymMapExists(synonymMap.getName()));
-        Assert.assertTrue(client.synonymMapExists(synonymMap.getName(), requestOptions));
-        Assert.assertTrue(client.synonymMapExistsWithResponse(synonymMap.getName(),
-            requestOptions,
-            context)
+        Assert.assertTrue(client.synonymMapExists(synonymMap.getName(), generateRequestOptions()));
+        Assert.assertTrue(client.synonymMapExistsWithResponse(synonymMap.getName(), generateRequestOptions(), context)
             .getValue());
     }
 
     @Override
     public void existsReturnsFalseForNonExistingSynonymMap() {
         String synonymMapName = "thisSynonymMapDoesNotExist";
-
-        RequestOptions requestOptions = new RequestOptions()
-            .setClientRequestId(UUID.randomUUID());
         Context context = new Context("key", "value");
 
         Assert.assertFalse(client.synonymMapExists(synonymMapName));
-        Assert.assertFalse(client.synonymMapExists(synonymMapName, requestOptions));
-        Assert.assertFalse(client.synonymMapExistsWithResponse(synonymMapName,
-            requestOptions,
-            context)
+        Assert.assertFalse(client.synonymMapExists(synonymMapName, generateRequestOptions()));
+        Assert.assertFalse(client.synonymMapExistsWithResponse(synonymMapName, generateRequestOptions(), context)
             .getValue());
     }
 
diff --git a/sdk/search/azure-search/src/test/resources/session-records/canCreateAndListSynonymMaps.json b/sdk/search/azure-search/src/test/resources/session-records/canCreateAndListSynonymMaps.json
index 32e9717860713..6493e6a0f9b28 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/canCreateAndListSynonymMaps.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/canCreateAndListSynonymMaps.json
@@ -1,113 +1,113 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://azs-sdk16099676bfd7.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "a42c4b75-36f1-4f68-913a-49f43effc345",
+      "request-id" : "7a50aa14-60c1-4c44-9387-be338a791d5f",
       "StatusCode" : "201",
-      "Date" : "Wed, 30 Oct 2019 21:56:34 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:55:05 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75D84083540C0\"",
-      "elapsed-time" : "41",
+      "ETag" : "W/\"0x8D7687361632B23\"",
+      "elapsed-time" : "54",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk16099676bfd7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D84083540C0\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687361632B23\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk16099676bfd7.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://azs-sdk16099676bfd7.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "80cad184-0b77-4721-9ea2-87fc0487878f",
+      "request-id" : "22734119-bb57-40ce-a77a-bfcd25c8ec1a",
       "StatusCode" : "201",
-      "Date" : "Wed, 30 Oct 2019 21:56:34 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:55:05 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75D840893C57A\"",
-      "elapsed-time" : "92",
+      "ETag" : "W/\"0x8D7687361761AE9\"",
+      "elapsed-time" : "22",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "199",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk16099676bfd7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D840893C57A\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "211",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687361761AE9\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk16099676bfd7.search.windows.net/synonymmaps('test-synonym1')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/synonymmaps('test-synonym1')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk16099676bfd7.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "b04865c2-acbc-42a5-88ff-365f5ea26c2f",
+      "request-id" : "203b93cf-2b31-4a3e-86e1-54841f83da85",
       "StatusCode" : "200",
-      "Date" : "Wed, 30 Oct 2019 21:56:35 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:55:05 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "25",
+      "elapsed-time" : "13",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "306",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk16099676bfd7.search.windows.net/$metadata#synonymmaps\",\"value\":[{\"@odata.etag\":\"\\\"0x8D75D84083540C0\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"},{\"@odata.etag\":\"\\\"0x8D75D840893C57A\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}]}",
+      "Content-Length" : "318",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/$metadata#synonymmaps\",\"value\":[{\"@odata.etag\":\"\\\"0x8D7687361632B23\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"},{\"@odata.etag\":\"\\\"0x8D7687361761AE9\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}]}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk16099676bfd7.search.windows.net/synonymmaps?$select=name&api-version=2019-05-06",
+    "Uri" : "https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/synonymmaps?$select=name&api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "f4fa1545-1bac-4728-95d7-14fb1ab4a38c",
+      "request-id" : "05508b4e-0c31-44dc-bb92-9ba214583cfa",
       "StatusCode" : "200",
-      "Date" : "Wed, 30 Oct 2019 21:56:35 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:55:06 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "131",
+      "elapsed-time" : "6",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "154",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk16099676bfd7.search.windows.net/$metadata#synonymmaps(name)\",\"value\":[{\"name\":\"test-synonym\"},{\"name\":\"test-synonym1\"}]}",
+      "Content-Length" : "166",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/$metadata#synonymmaps(name)\",\"value\":[{\"name\":\"test-synonym\"},{\"name\":\"test-synonym1\"}]}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk16099676bfd7.search.windows.net/synonymmaps?$select=name&api-version=2019-05-06",
+    "Uri" : "https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/synonymmaps?$select=name&api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "f4fa1545-1bac-4728-95d7-14fb1ab4a38c",
+      "request-id" : "1a9c1bb6-d8da-49ac-962d-77bba57d5364",
       "StatusCode" : "200",
-      "Date" : "Wed, 30 Oct 2019 21:56:35 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:55:06 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "9",
+      "elapsed-time" : "6",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "154",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk16099676bfd7.search.windows.net/$metadata#synonymmaps(name)\",\"value\":[{\"name\":\"test-synonym\"},{\"name\":\"test-synonym1\"}]}",
+      "Content-Length" : "166",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk00582985c6a8.search-dogfood.windows-int.net/$metadata#synonymmaps(name)\",\"value\":[{\"name\":\"test-synonym\"},{\"name\":\"test-synonym1\"}]}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
diff --git a/sdk/search/azure-search/src/test/resources/session-records/canListSynonymMapsWithSelectedField.json b/sdk/search/azure-search/src/test/resources/session-records/canListSynonymMapsWithSelectedField.json
index 2f1bb0686d7f7..94c2c31d55b31 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/canListSynonymMapsWithSelectedField.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/canListSynonymMapsWithSelectedField.json
@@ -1,92 +1,92 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://azs-sdkebc47698d35d.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk202551976702.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "b9a4a769-a0f9-4034-b2b0-26866c7fefe9",
+      "request-id" : "973583a4-3f4f-46c7-b924-7b90768df3cc",
       "StatusCode" : "201",
-      "Date" : "Tue, 29 Oct 2019 23:25:04 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:41 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CC73AE36B07\"",
-      "elapsed-time" : "58",
+      "ETag" : "W/\"0x8D768732ED3FD64\"",
+      "elapsed-time" : "41",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkebc47698d35d.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CC73AE36B07\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk202551976702.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768732ED3FD64\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdkebc47698d35d.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk202551976702.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://azs-sdkebc47698d35d.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk202551976702.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "9ce4f037-1b6c-4fbe-a3f5-25b18e6e82f1",
+      "request-id" : "c2dacea3-aedf-4d6c-a68f-ba4f54cbe204",
       "StatusCode" : "201",
-      "Date" : "Tue, 29 Oct 2019 23:25:05 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:41 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CC73AF32541\"",
-      "elapsed-time" : "19",
+      "ETag" : "W/\"0x8D768732EE5B479\"",
+      "elapsed-time" : "20",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "199",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkebc47698d35d.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CC73AF32541\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "211",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk202551976702.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768732EE5B479\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdkebc47698d35d.search.windows.net/synonymmaps('test-synonym1')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk202551976702.search-dogfood.windows-int.net/synonymmaps('test-synonym1')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdkebc47698d35d.search.windows.net/synonymmaps?$select=name&api-version=2019-05-06",
+    "Uri" : "https://azs-sdk202551976702.search-dogfood.windows-int.net/synonymmaps?$select=name&api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "38475963-461d-4a8d-aa3f-fb399de2057d",
+      "request-id" : "b7f2d34b-e847-4361-b9e4-b8cc02e45df9",
       "StatusCode" : "200",
-      "Date" : "Tue, 29 Oct 2019 23:25:05 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:41 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "6",
+      "elapsed-time" : "13",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "154",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkebc47698d35d.search.windows.net/$metadata#synonymmaps(name)\",\"value\":[{\"name\":\"test-synonym\"},{\"name\":\"test-synonym1\"}]}",
+      "Content-Length" : "166",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk202551976702.search-dogfood.windows-int.net/$metadata#synonymmaps(name)\",\"value\":[{\"name\":\"test-synonym\"},{\"name\":\"test-synonym1\"}]}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdkebc47698d35d.search.windows.net/synonymmaps?$select=name&api-version=2019-05-06",
+    "Uri" : "https://azs-sdk202551976702.search-dogfood.windows-int.net/synonymmaps?$select=name&api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "32df4c4a-343f-46db-9ea4-df366b87671c",
+      "request-id" : "b7f2d34b-e847-4361-b9e4-b8cc02e45df9",
       "StatusCode" : "200",
-      "Date" : "Tue, 29 Oct 2019 23:25:05 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:41 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "5",
+      "elapsed-time" : "6",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "154",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkebc47698d35d.search.windows.net/$metadata#synonymmaps(name)\",\"value\":[{\"name\":\"test-synonym\"},{\"name\":\"test-synonym1\"}]}",
+      "Content-Length" : "166",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk202551976702.search-dogfood.windows-int.net/$metadata#synonymmaps(name)\",\"value\":[{\"name\":\"test-synonym\"},{\"name\":\"test-synonym1\"}]}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
diff --git a/sdk/search/azure-search/src/test/resources/session-records/canUpdateSynonymMap.json b/sdk/search/azure-search/src/test/resources/session-records/canUpdateSynonymMap.json
index d3d030507fa48..70cb3102d8688 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/canUpdateSynonymMap.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/canUpdateSynonymMap.json
@@ -1,70 +1,70 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://azs-sdk9234962250b1.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdkd4a4023359d6.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "40c50f38-7145-46eb-821c-c5bebfc27464",
+      "request-id" : "5dff0b01-ba7b-48a4-b6b9-525bfab183c1",
       "StatusCode" : "201",
-      "Date" : "Thu, 07 Nov 2019 16:28:40 GMT",
+      "Date" : "Wed, 13 Nov 2019 20:15:47 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D7639F8CFEDDB1\"",
-      "elapsed-time" : "130",
+      "ETag" : "W/\"0x8D76876458AF564\"",
+      "elapsed-time" : "45",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk9234962250b1.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7639F8CFEDDB1\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdkd4a4023359d6.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D76876458AF564\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk9234962250b1.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdkd4a4023359d6.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdk9234962250b1.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdkd4a4023359d6.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "6c5b5a3b-ea37-4aa8-b6a2-fae6441dec83",
+      "request-id" : "e642255b-d24b-4b40-b69a-2bc0b57369ab",
       "StatusCode" : "200",
-      "Date" : "Thu, 07 Nov 2019 16:28:41 GMT",
+      "Date" : "Wed, 13 Nov 2019 20:15:47 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D7639F8D2271C0\"",
-      "elapsed-time" : "60",
+      "ETag" : "W/\"0x8D7687645A0F319\"",
+      "elapsed-time" : "17",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "204",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk9234962250b1.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7639F8D2271C0\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"newword1,newword2\"}",
+      "Content-Length" : "216",
+      "Body" : "{\"@odata.context\":\"https://azs-sdkd4a4023359d6.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687645A0F319\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"newword1,newword2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk9234962250b1.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdkd4a4023359d6.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "62dc6699-c186-4f9a-a7ad-f839b83b7717",
+      "request-id" : "11c91687-b067-4c8a-af04-2679f7477467",
       "StatusCode" : "200",
-      "Date" : "Thu, 07 Nov 2019 16:28:41 GMT",
+      "Date" : "Wed, 13 Nov 2019 20:15:47 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "38",
+      "elapsed-time" : "13",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "208",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk9234962250b1.search.windows.net/$metadata#synonymmaps\",\"value\":[{\"@odata.etag\":\"\\\"0x8D7639F8D2271C0\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"newword1,newword2\"}]}",
+      "Content-Length" : "220",
+      "Body" : "{\"@odata.context\":\"https://azs-sdkd4a4023359d6.search-dogfood.windows-int.net/$metadata#synonymmaps\",\"value\":[{\"@odata.etag\":\"\\\"0x8D7687645A0F319\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"newword1,newword2\"}]}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
diff --git a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapCreatesWhenSynonymMapDoesNotExist.json b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapCreatesWhenSynonymMapDoesNotExist.json
index 339bc2ca48f8e..63acba7bf607b 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapCreatesWhenSynonymMapDoesNotExist.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapCreatesWhenSynonymMapDoesNotExist.json
@@ -1,77 +1,77 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdk2b6022431482.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk54b9518340df.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "3ce86e73-32f7-4113-93dd-94f7162c8189",
+      "request-id" : "b46decb6-e5ff-4e19-a633-d9d26eb9f9da",
       "StatusCode" : "201",
-      "Date" : "Wed, 30 Oct 2019 18:29:30 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:27 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75D671A89EBD9\"",
-      "elapsed-time" : "46",
+      "ETag" : "W/\"0x8D7687327297427\"",
+      "elapsed-time" : "44",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk2b6022431482.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D671A89EBD9\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk54b9518340df.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687327297427\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk2b6022431482.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk54b9518340df.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdk2b6022431482.search.windows.net/synonymmaps('test-synonym1')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk54b9518340df.search-dogfood.windows-int.net/synonymmaps('test-synonym1')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "7e7d638c-39f0-4362-9ca6-de060bc1d060",
+      "request-id" : "276bd5bb-a884-4764-802e-58fe7b69c6d1",
       "StatusCode" : "201",
-      "Date" : "Wed, 30 Oct 2019 18:29:30 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:28 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75D671A9F739A\"",
+      "ETag" : "W/\"0x8D76873273F239F\"",
       "elapsed-time" : "20",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "199",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk2b6022431482.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D671A9F739A\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "211",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk54b9518340df.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D76873273F239F\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk2b6022431482.search.windows.net/synonymmaps('test-synonym1')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk54b9518340df.search-dogfood.windows-int.net/synonymmaps('test-synonym1')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdk2b6022431482.search.windows.net/synonymmaps('test-synonym2')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk54b9518340df.search-dogfood.windows-int.net/synonymmaps('test-synonym2')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "7e7d638c-39f0-4362-9ca6-de060bc1d060",
+      "request-id" : "2de6b72c-8ee5-4aa3-ad3e-68b2c9b44e0a",
       "StatusCode" : "201",
-      "Date" : "Wed, 30 Oct 2019 18:29:30 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:28 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75D671AB03F90\"",
-      "elapsed-time" : "26",
+      "ETag" : "W/\"0x8D768732750DA9E\"",
+      "elapsed-time" : "21",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "199",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk2b6022431482.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D671AB03F90\\\"\",\"name\":\"test-synonym2\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "211",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk54b9518340df.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768732750DA9E\\\"\",\"name\":\"test-synonym2\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk2b6022431482.search.windows.net/synonymmaps('test-synonym2')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk54b9518340df.search-dogfood.windows-int.net/synonymmaps('test-synonym2')?api-version=2019-05-06"
     },
     "Exception" : null
   } ],
diff --git a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfExistsFailsOnNoResource.json b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfExistsFailsOnNoResource.json
index 621a1c2855e85..6e4c6bd4f6442 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfExistsFailsOnNoResource.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfExistsFailsOnNoResource.json
@@ -1,28 +1,28 @@
 {
-    "networkCallRecords" : [ {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdka7c49316cd9c.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "991bdb4c-a156-4872-bbb0-f70ca2f90fe2",
-            "StatusCode" : "412",
-            "Date" : "Wed, 30 Oct 2019 21:29:38 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "elapsed-time" : "28",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "160",
-            "Body" : "{\"error\":{\"code\":\"\",\"message\":\"The precondition given in one of the request headers evaluated to false. No change was made to the resource from this request.\"}}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Language" : "en",
-            "Content-Type" : "application/json; odata.metadata=minimal"
-        },
-        "Exception" : null
-    } ],
-    "variables" : [ ]
-}
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azs-sdk5c9902858090.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Headers" : {
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Pragma" : "no-cache",
+      "retry-after" : "0",
+      "request-id" : "b1cdc081-09e3-41ec-af07-f1ac01ddffdd",
+      "StatusCode" : "412",
+      "Date" : "Wed, 13 Nov 2019 19:54:26 GMT",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Cache-Control" : "no-cache",
+      "elapsed-time" : "23",
+      "OData-Version" : "4.0",
+      "Expires" : "-1",
+      "Content-Length" : "160",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"The precondition given in one of the request headers evaluated to false. No change was made to the resource from this request.\"}}",
+      "Preference-Applied" : "odata.include-annotations=\"*\"",
+      "Content-Language" : "en",
+      "Content-Type" : "application/json; odata.metadata=minimal"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfExistsSucceedsOnExistingResource.json b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfExistsSucceedsOnExistingResource.json
index a5f6536360f51..f3d1477733c39 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfExistsSucceedsOnExistingResource.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfExistsSucceedsOnExistingResource.json
@@ -1,53 +1,53 @@
 {
-    "networkCallRecords" : [ {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdka4f17586afe3.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "61b047a9-7106-4055-91fe-a3f52a86c642",
-            "StatusCode" : "201",
-            "Date" : "Wed, 30 Oct 2019 21:29:18 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "ETag" : "W/\"0x8D75D8038BFB80E\"",
-            "elapsed-time" : "37",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "198",
-            "Body" : "{\"@odata.context\":\"https://azs-sdka4f17586afe3.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D8038BFB80E\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Type" : "application/json; odata.metadata=minimal",
-            "Location" : "https://azs-sdka4f17586afe3.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
-        },
-        "Exception" : null
-    }, {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdka4f17586afe3.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "96e7375f-dc00-4aa9-b948-2b8376d52a77",
-            "StatusCode" : "200",
-            "Date" : "Wed, 30 Oct 2019 21:29:18 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "ETag" : "W/\"0x8D75D8038D7FF5E\"",
-            "elapsed-time" : "19",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "205",
-            "Body" : "{\"@odata.context\":\"https://azs-sdka4f17586afe3.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D8038D7FF5E\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"mutated1, mutated2\"}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Type" : "application/json; odata.metadata=minimal"
-        },
-        "Exception" : null
-    } ],
-    "variables" : [ ]
-}
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azs-sdk60272505a674.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Headers" : {
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Pragma" : "no-cache",
+      "retry-after" : "0",
+      "request-id" : "c65ca38a-8f56-490e-bbb7-84c8042e26da",
+      "StatusCode" : "201",
+      "Date" : "Wed, 13 Nov 2019 19:54:00 GMT",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Cache-Control" : "no-cache",
+      "ETag" : "W/\"0x8D768733A39C195\"",
+      "elapsed-time" : "45",
+      "OData-Version" : "4.0",
+      "Expires" : "-1",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk60272505a674.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768733A39C195\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Preference-Applied" : "odata.include-annotations=\"*\"",
+      "Content-Type" : "application/json; odata.metadata=minimal",
+      "Location" : "https://azs-sdk60272505a674.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azs-sdk60272505a674.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Headers" : {
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Pragma" : "no-cache",
+      "retry-after" : "0",
+      "request-id" : "3172420e-41f9-4d46-b877-200e8971efba",
+      "StatusCode" : "200",
+      "Date" : "Wed, 13 Nov 2019 19:54:00 GMT",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Cache-Control" : "no-cache",
+      "ETag" : "W/\"0x8D768733A4B2A6C\"",
+      "elapsed-time" : "18",
+      "OData-Version" : "4.0",
+      "Expires" : "-1",
+      "Content-Length" : "217",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk60272505a674.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768733A4B2A6C\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"mutated1, mutated2\"}",
+      "Preference-Applied" : "odata.include-annotations=\"*\"",
+      "Content-Type" : "application/json; odata.metadata=minimal"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotChangedFailsWhenResourceChanged.json b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotChangedFailsWhenResourceChanged.json
index 9103bad6be389..701e65c8613fa 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotChangedFailsWhenResourceChanged.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotChangedFailsWhenResourceChanged.json
@@ -1,68 +1,68 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdk478589375d56.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk813906376e62.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "b1ef6ab6-e5b2-4e94-843d-9d2b5ab59ed1",
+      "request-id" : "b9a89c2a-a326-4d54-a76c-b78cbfba421e",
       "StatusCode" : "201",
-      "Date" : "Wed, 30 Oct 2019 18:42:44 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:55:33 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75D68F3D62A2C\"",
-      "elapsed-time" : "511",
+      "ETag" : "W/\"0x8D7687371B7E295\"",
+      "elapsed-time" : "44",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk478589375d56.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D68F3D62A2C\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk813906376e62.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687371B7E295\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk478589375d56.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk813906376e62.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdk478589375d56.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk813906376e62.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "531b7362-262d-4a7a-89b5-dc678666fcec",
+      "request-id" : "237c1ffd-68b0-4bfa-b835-b91ab0ab54a8",
       "StatusCode" : "200",
-      "Date" : "Wed, 30 Oct 2019 18:42:44 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:55:33 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75D68F42743D3\"",
-      "elapsed-time" : "71",
+      "ETag" : "W/\"0x8D7687371CAF977\"",
+      "elapsed-time" : "27",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "205",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk478589375d56.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D68F42743D3\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"mutated1, mutated2\"}",
+      "Content-Length" : "217",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk813906376e62.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687371CAF977\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"mutated1, mutated2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdk478589375d56.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk813906376e62.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "fd9f9100-4be3-4064-97c1-14c57565ca99",
+      "request-id" : "c0d87c47-bfb1-4230-907a-cb1a7c45e7a0",
       "StatusCode" : "412",
-      "Date" : "Wed, 30 Oct 2019 18:42:45 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:55:33 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "9",
+      "elapsed-time" : "6",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "160",
diff --git a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotChangedSucceedsWhenResourceUnchanged.json b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotChangedSucceedsWhenResourceUnchanged.json
index 87333aa4fa7cb..c640c64de9618 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotChangedSucceedsWhenResourceUnchanged.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotChangedSucceedsWhenResourceUnchanged.json
@@ -1,49 +1,49 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdkbbd95143d01e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk5d0491772cf3.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "356164e5-c1a7-444f-a005-303c8e453012",
+      "request-id" : "aaf794ad-1945-4cca-bbd4-d53bab3449b1",
       "StatusCode" : "201",
-      "Date" : "Wed, 30 Oct 2019 18:42:17 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:20 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75D68E446A054\"",
-      "elapsed-time" : "116",
+      "ETag" : "W/\"0x8D7687345FCADB6\"",
+      "elapsed-time" : "49",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkbbd95143d01e.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D68E446A054\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk5d0491772cf3.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687345FCADB6\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdkbbd95143d01e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk5d0491772cf3.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdkbbd95143d01e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk5d0491772cf3.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "2569a6e4-534b-40c6-b43a-872877082565",
+      "request-id" : "1a08a35b-adc7-445b-8337-81b4c7d48002",
       "StatusCode" : "200",
-      "Date" : "Wed, 30 Oct 2019 18:42:18 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:20 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75D68E46BBD72\"",
-      "elapsed-time" : "58",
+      "ETag" : "W/\"0x8D76873460F011B\"",
+      "elapsed-time" : "17",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "205",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkbbd95143d01e.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75D68E46BBD72\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"mutated1, mutated2\"}",
+      "Content-Length" : "217",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk5d0491772cf3.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D76873460F011B\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"mutated1, mutated2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
diff --git a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotExistsFailsOnExistingResource.json b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotExistsFailsOnExistingResource.json
index 72f1fb08de280..6c97d575f2a31 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotExistsFailsOnExistingResource.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotExistsFailsOnExistingResource.json
@@ -1,125 +1,77 @@
 {
-    "networkCallRecords" : [ {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdkff720224b30e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "d7a00f51-5c8d-4ff5-99ec-494aa7a35f7e",
-            "StatusCode" : "201",
-            "Date" : "Thu, 31 Oct 2019 07:43:34 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "ETag" : "W/\"0x8D75DD608CE00E2\"",
-            "elapsed-time" : "50",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "198",
-            "Body" : "{\"@odata.context\":\"https://azs-sdkff720224b30e.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75DD608CE00E2\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Type" : "application/json; odata.metadata=minimal",
-            "Location" : "https://azs-sdkff720224b30e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
-        },
-        "Exception" : null
-    }, {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdkff720224b30e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "8b964ccf-854e-4ceb-80cf-864f98cd9027",
-            "StatusCode" : "412",
-            "Date" : "Thu, 31 Oct 2019 07:43:35 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "elapsed-time" : "21",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "160",
-            "Body" : "{\"error\":{\"code\":\"\",\"message\":\"The precondition given in one of the request headers evaluated to false. No change was made to the resource from this request.\"}}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Language" : "en",
-            "Content-Type" : "application/json; odata.metadata=minimal"
-        },
-        "Exception" : null
-    }, {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdkff720224b30e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "930153e6-9761-43ef-9bd1-ff1b7754b7d2",
-            "StatusCode" : "412",
-            "Date" : "Thu, 31 Oct 2019 07:43:35 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "elapsed-time" : "9",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "160",
-            "Body" : "{\"error\":{\"code\":\"\",\"message\":\"The precondition given in one of the request headers evaluated to false. No change was made to the resource from this request.\"}}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Language" : "en",
-            "Content-Type" : "application/json; odata.metadata=minimal"
-        },
-        "Exception" : null
-    }, {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdkff720224b30e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "930153e6-9761-43ef-9bd1-ff1b7754b7d2",
-            "StatusCode" : "412",
-            "Date" : "Thu, 31 Oct 2019 07:43:35 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "elapsed-time" : "5",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "160",
-            "Body" : "{\"error\":{\"code\":\"\",\"message\":\"The precondition given in one of the request headers evaluated to false. No change was made to the resource from this request.\"}}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Language" : "en",
-            "Content-Type" : "application/json; odata.metadata=minimal"
-        },
-        "Exception" : null
-    }, {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdkff720224b30e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "930153e6-9761-43ef-9bd1-ff1b7754b7d2",
-            "StatusCode" : "412",
-            "Date" : "Thu, 31 Oct 2019 07:43:35 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "elapsed-time" : "6",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "160",
-            "Body" : "{\"error\":{\"code\":\"\",\"message\":\"The precondition given in one of the request headers evaluated to false. No change was made to the resource from this request.\"}}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Language" : "en",
-            "Content-Type" : "application/json; odata.metadata=minimal"
-        },
-        "Exception" : null
-    } ],
-    "variables" : [ ]
-}
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azs-sdk77788351aab9.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Headers" : {
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Pragma" : "no-cache",
+      "retry-after" : "0",
+      "request-id" : "895f97f2-a46f-40ba-bec5-ddcf4a6ed231",
+      "StatusCode" : "201",
+      "Date" : "Wed, 13 Nov 2019 19:55:26 GMT",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Cache-Control" : "no-cache",
+      "ETag" : "W/\"0x8D768736DC9F41E\"",
+      "elapsed-time" : "41",
+      "OData-Version" : "4.0",
+      "Expires" : "-1",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk77788351aab9.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768736DC9F41E\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Preference-Applied" : "odata.include-annotations=\"*\"",
+      "Content-Type" : "application/json; odata.metadata=minimal",
+      "Location" : "https://azs-sdk77788351aab9.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azs-sdk77788351aab9.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Headers" : {
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Pragma" : "no-cache",
+      "retry-after" : "0",
+      "request-id" : "f97b34aa-7bec-4d8b-bfed-ef2739895b9c",
+      "StatusCode" : "412",
+      "Date" : "Wed, 13 Nov 2019 19:55:26 GMT",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Cache-Control" : "no-cache",
+      "elapsed-time" : "8",
+      "OData-Version" : "4.0",
+      "Expires" : "-1",
+      "Content-Length" : "160",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"The precondition given in one of the request headers evaluated to false. No change was made to the resource from this request.\"}}",
+      "Preference-Applied" : "odata.include-annotations=\"*\"",
+      "Content-Language" : "en",
+      "Content-Type" : "application/json; odata.metadata=minimal"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azs-sdk77788351aab9.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Headers" : {
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Pragma" : "no-cache",
+      "retry-after" : "0",
+      "request-id" : "968488ec-37ca-4329-97fe-aa794b76225a",
+      "StatusCode" : "412",
+      "Date" : "Wed, 13 Nov 2019 19:55:26 GMT",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Cache-Control" : "no-cache",
+      "elapsed-time" : "8",
+      "OData-Version" : "4.0",
+      "Expires" : "-1",
+      "Content-Length" : "160",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"The precondition given in one of the request headers evaluated to false. No change was made to the resource from this request.\"}}",
+      "Preference-Applied" : "odata.include-annotations=\"*\"",
+      "Content-Language" : "en",
+      "Content-Type" : "application/json; odata.metadata=minimal"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotExistsSucceedsOnNoResource.json b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotExistsSucceedsOnNoResource.json
index ca53da19d8e86..12fcc940c039f 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotExistsSucceedsOnNoResource.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/createOrUpdateSynonymMapIfNotExistsSucceedsOnNoResource.json
@@ -1,79 +1,79 @@
 {
-    "networkCallRecords" : [ {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdk7f32176422d7.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "f5cd8e8d-8c49-42c5-97f9-ec3ecf42eaa9",
-            "StatusCode" : "201",
-            "Date" : "Thu, 31 Oct 2019 07:42:26 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "ETag" : "W/\"0x8D75DD5E04DD03A\"",
-            "elapsed-time" : "119",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "198",
-            "Body" : "{\"@odata.context\":\"https://azs-sdk7f32176422d7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75DD5E04DD03A\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Type" : "application/json; odata.metadata=minimal",
-            "Location" : "https://azs-sdk7f32176422d7.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
-        },
-        "Exception" : null
-    }, {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdk7f32176422d7.search.windows.net/synonymmaps('test-synonym1')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "5826eb46-d174-43cd-bd0a-fff9b6b5e68c",
-            "StatusCode" : "201",
-            "Date" : "Thu, 31 Oct 2019 07:42:26 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "ETag" : "W/\"0x8D75DD5E07DE99B\"",
-            "elapsed-time" : "49",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "199",
-            "Body" : "{\"@odata.context\":\"https://azs-sdk7f32176422d7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75DD5E07DE99B\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Type" : "application/json; odata.metadata=minimal",
-            "Location" : "https://azs-sdk7f32176422d7.search.windows.net/synonymmaps('test-synonym1')?api-version=2019-05-06"
-        },
-        "Exception" : null
-    }, {
-        "Method" : "PUT",
-        "Uri" : "https://azs-sdk7f32176422d7.search.windows.net/synonymmaps('test-synonym2')?api-version=2019-05-06",
-        "Headers" : {
-            "Content-Type" : "application/json; charset=utf-8"
-        },
-        "Response" : {
-            "Pragma" : "no-cache",
-            "retry-after" : "0",
-            "request-id" : "5826eb46-d174-43cd-bd0a-fff9b6b5e68c",
-            "StatusCode" : "201",
-            "Date" : "Thu, 31 Oct 2019 07:42:26 GMT",
-            "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-            "Cache-Control" : "no-cache",
-            "ETag" : "W/\"0x8D75DD5E0B6DE32\"",
-            "elapsed-time" : "29",
-            "OData-Version" : "4.0",
-            "Expires" : "-1",
-            "Content-Length" : "199",
-            "Body" : "{\"@odata.context\":\"https://azs-sdk7f32176422d7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75DD5E0B6DE32\\\"\",\"name\":\"test-synonym2\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
-            "Preference-Applied" : "odata.include-annotations=\"*\"",
-            "Content-Type" : "application/json; odata.metadata=minimal",
-            "Location" : "https://azs-sdk7f32176422d7.search.windows.net/synonymmaps('test-synonym2')?api-version=2019-05-06"
-        },
-        "Exception" : null
-    } ],
-    "variables" : [ ]
-}
+  "networkCallRecords" : [ {
+    "Method" : "PUT",
+    "Uri" : "https://azs-sdk17937147c816.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Headers" : {
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Pragma" : "no-cache",
+      "retry-after" : "0",
+      "request-id" : "f0bb3e67-b721-4d7c-85ad-9635929e1867",
+      "StatusCode" : "201",
+      "Date" : "Wed, 13 Nov 2019 19:53:47 GMT",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Cache-Control" : "no-cache",
+      "ETag" : "W/\"0x8D768733292E29B\"",
+      "elapsed-time" : "44",
+      "OData-Version" : "4.0",
+      "Expires" : "-1",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk17937147c816.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768733292E29B\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Preference-Applied" : "odata.include-annotations=\"*\"",
+      "Content-Type" : "application/json; odata.metadata=minimal",
+      "Location" : "https://azs-sdk17937147c816.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azs-sdk17937147c816.search-dogfood.windows-int.net/synonymmaps('test-synonym1')?api-version=2019-05-06",
+    "Headers" : {
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Pragma" : "no-cache",
+      "retry-after" : "0",
+      "request-id" : "fec78923-55de-491c-bd67-02c61663c4c8",
+      "StatusCode" : "201",
+      "Date" : "Wed, 13 Nov 2019 19:53:47 GMT",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Cache-Control" : "no-cache",
+      "ETag" : "W/\"0x8D7687332A55D1D\"",
+      "elapsed-time" : "24",
+      "OData-Version" : "4.0",
+      "Expires" : "-1",
+      "Content-Length" : "211",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk17937147c816.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687332A55D1D\\\"\",\"name\":\"test-synonym1\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Preference-Applied" : "odata.include-annotations=\"*\"",
+      "Content-Type" : "application/json; odata.metadata=minimal",
+      "Location" : "https://azs-sdk17937147c816.search-dogfood.windows-int.net/synonymmaps('test-synonym1')?api-version=2019-05-06"
+    },
+    "Exception" : null
+  }, {
+    "Method" : "PUT",
+    "Uri" : "https://azs-sdk17937147c816.search-dogfood.windows-int.net/synonymmaps('test-synonym2')?api-version=2019-05-06",
+    "Headers" : {
+      "Content-Type" : "application/json; charset=utf-8"
+    },
+    "Response" : {
+      "Pragma" : "no-cache",
+      "retry-after" : "0",
+      "request-id" : "730086b6-dcd0-42de-809d-2849177670c8",
+      "StatusCode" : "201",
+      "Date" : "Wed, 13 Nov 2019 19:53:47 GMT",
+      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
+      "Cache-Control" : "no-cache",
+      "ETag" : "W/\"0x8D7687332B84CDF\"",
+      "elapsed-time" : "24",
+      "OData-Version" : "4.0",
+      "Expires" : "-1",
+      "Content-Length" : "211",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk17937147c816.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687332B84CDF\\\"\",\"name\":\"test-synonym2\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Preference-Applied" : "odata.include-annotations=\"*\"",
+      "Content-Type" : "application/json; odata.metadata=minimal",
+      "Location" : "https://azs-sdk17937147c816.search-dogfood.windows-int.net/synonymmaps('test-synonym2')?api-version=2019-05-06"
+    },
+    "Exception" : null
+  } ],
+  "variables" : [ ]
+}
\ No newline at end of file
diff --git a/sdk/search/azure-search/src/test/resources/session-records/createSynonymMapFailsWithUsefulMessageOnUserError.json b/sdk/search/azure-search/src/test/resources/session-records/createSynonymMapFailsWithUsefulMessageOnUserError.json
index 4f290490494f1..bf01816c8c9db 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/createSynonymMapFailsWithUsefulMessageOnUserError.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/createSynonymMapFailsWithUsefulMessageOnUserError.json
@@ -1,19 +1,19 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://azs-sdk72e02843faf9.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk79e4200721f1.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "329caec1-5e08-43eb-bdb7-04a175514e16",
+      "request-id" : "023bbdc8-de39-4322-9b4c-be1ebabe3790",
       "StatusCode" : "400",
-      "Date" : "Tue, 29 Oct 2019 23:25:27 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:55:14 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "68",
+      "elapsed-time" : "28",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "139",
diff --git a/sdk/search/azure-search/src/test/resources/session-records/createSynonymMapReturnsCorrectDefinition.json b/sdk/search/azure-search/src/test/resources/session-records/createSynonymMapReturnsCorrectDefinition.json
index 3c095b17865b3..2c231015c387a 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/createSynonymMapReturnsCorrectDefinition.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/createSynonymMapReturnsCorrectDefinition.json
@@ -1,27 +1,27 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://azs-sdk50397493adf7.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk1f812357b345.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "e6fbbd8e-9b6f-4882-add3-c88ac7c44441",
+      "request-id" : "dc25beae-b58d-42b8-8d75-46774f5f87e5",
       "StatusCode" : "201",
-      "Date" : "Tue, 29 Oct 2019 23:25:10 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:33 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CC73E433610\"",
-      "elapsed-time" : "38",
+      "ETag" : "W/\"0x8D768734DFC46D6\"",
+      "elapsed-time" : "42",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk50397493adf7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CC73E433610\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk1f812357b345.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768734DFC46D6\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk50397493adf7.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk1f812357b345.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   } ],
diff --git a/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIfExistsWorksOnlyWhenResourceExists.json b/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIfExistsWorksOnlyWhenResourceExists.json
index 35e5e5b07c518..6ceea67547034 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIfExistsWorksOnlyWhenResourceExists.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIfExistsWorksOnlyWhenResourceExists.json
@@ -1,58 +1,58 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://azs-sdk2f925909d842.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk9b957750054b.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "a2a81072-a279-4156-b958-b5ccdcdd2738",
+      "request-id" : "13c2f3d0-2021-4182-8bf6-1fcef4b0cc62",
       "StatusCode" : "201",
-      "Date" : "Wed, 06 Nov 2019 00:16:38 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:51 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D7624E97B6E25F\"",
-      "elapsed-time" : "66",
+      "ETag" : "W/\"0x8D7687358EE21FE\"",
+      "elapsed-time" : "43",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk2f925909d842.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7624E97B6E25F\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk9b957750054b.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687358EE21FE\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk2f925909d842.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk9b957750054b.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azs-sdk2f925909d842.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk9b957750054b.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "29",
+      "elapsed-time" : "12",
       "Expires" : "-1",
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "406fcd1b-223c-4e32-a8b7-9230815e8d2e",
+      "request-id" : "3a4f4033-3de1-443b-8e52-f63d5e1797db",
       "StatusCode" : "204",
-      "Date" : "Wed, 06 Nov 2019 00:16:38 GMT"
+      "Date" : "Wed, 13 Nov 2019 19:54:51 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azs-sdk2f925909d842.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk9b957750054b.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "288b7fae-b7c1-4755-8fba-4154ebfdb38d",
+      "request-id" : "0e629fd3-9153-4475-bedf-183b8523a0a4",
       "StatusCode" : "412",
-      "Date" : "Wed, 06 Nov 2019 00:16:38 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:51 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "6",
+      "elapsed-time" : "5",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "160",
diff --git a/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIfNotChangedWorksOnlyOnCurrentResource.json b/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIfNotChangedWorksOnlyOnCurrentResource.json
index 7535cfa506016..b34e343846fc4 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIfNotChangedWorksOnlyOnCurrentResource.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIfNotChangedWorksOnlyOnCurrentResource.json
@@ -1,66 +1,66 @@
 {
   "networkCallRecords" : [ {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdk847105502c9e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk15258261aa75.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "94d7e523-28d7-42b9-b4c4-a032d6a04a6e",
+      "request-id" : "55469b2e-6359-47fa-bc7a-66ddc7279503",
       "StatusCode" : "201",
-      "Date" : "Wed, 06 Nov 2019 00:12:50 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:59 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D7624E101A1F9F\"",
-      "elapsed-time" : "169",
+      "ETag" : "W/\"0x8D768735D2FC074\"",
+      "elapsed-time" : "63",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk847105502c9e.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7624E101A1F9F\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk15258261aa75.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768735D2FC074\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk847105502c9e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk15258261aa75.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "PUT",
-    "Uri" : "https://azs-sdk847105502c9e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk15258261aa75.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "db47d73b-7cf8-4269-b84e-3922804c32dc",
+      "request-id" : "a4899e09-8db8-4f25-8a85-d2d96eabe14f",
       "StatusCode" : "200",
-      "Date" : "Wed, 06 Nov 2019 00:12:51 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:59 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D7624E1079BC0D\"",
-      "elapsed-time" : "185",
+      "ETag" : "W/\"0x8D768735D408CE6\"",
+      "elapsed-time" : "18",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "212",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk847105502c9e.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7624E1079BC0D\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"updatedword1,updatedword2\"}",
+      "Content-Length" : "224",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk15258261aa75.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768735D408CE6\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"updatedword1,updatedword2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azs-sdk847105502c9e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk15258261aa75.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "0f6520a8-2e61-457f-a8c9-7e2195f7e6dd",
+      "request-id" : "199fc91b-c734-4bbf-aebe-c1f742bbdb0d",
       "StatusCode" : "412",
-      "Date" : "Wed, 06 Nov 2019 00:12:51 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:59 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "28",
+      "elapsed-time" : "5",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "160",
@@ -72,18 +72,18 @@
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azs-sdk847105502c9e.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk15258261aa75.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "40",
+      "elapsed-time" : "12",
       "Expires" : "-1",
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "e65ba84c-b85a-45a3-a167-d5e435326266",
+      "request-id" : "54bd3678-4967-4efb-b943-63f5b21378e8",
       "StatusCode" : "204",
-      "Date" : "Wed, 06 Nov 2019 00:12:52 GMT"
+      "Date" : "Wed, 13 Nov 2019 19:54:59 GMT"
     },
     "Exception" : null
   } ],
diff --git a/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIsIdempotent.json b/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIsIdempotent.json
index 660e4ad9d8b6b..f1e4a3c985f5e 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIsIdempotent.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/deleteSynonymMapIsIdempotent.json
@@ -1,21 +1,21 @@
 {
   "networkCallRecords" : [ {
     "Method" : "DELETE",
-    "Uri" : "https://azs-sdkd5035369c18d.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk49d32553fc20.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "db347b91-9861-4b8a-ba35-1167cf03f240",
+      "request-id" : "c0cc7d71-6dfc-4931-884b-24ba929c0c29",
       "StatusCode" : "404",
-      "Date" : "Wed, 06 Nov 2019 00:26:36 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:13 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "63",
+      "elapsed-time" : "25",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "128",
-      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonymMap with the name 'test-synonym' was found in a service named 'azs-sdkd5035369c18d'.\"}}",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonymMap with the name 'test-synonym' was found in a service named 'azs-sdk49d32553fc20'.\"}}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Language" : "en",
       "Content-Type" : "application/json; odata.metadata=minimal"
@@ -23,62 +23,62 @@
     "Exception" : null
   }, {
     "Method" : "POST",
-    "Uri" : "https://azs-sdkd5035369c18d.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk49d32553fc20.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "2181573b-d284-4806-8bec-32b7d9dfc6fa",
+      "request-id" : "d908db23-1522-4feb-8921-c25680460bf5",
       "StatusCode" : "201",
-      "Date" : "Wed, 06 Nov 2019 00:26:36 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:13 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D7624FFC618083\"",
-      "elapsed-time" : "29",
+      "ETag" : "W/\"0x8D7687342371051\"",
+      "elapsed-time" : "24",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkd5035369c18d.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7624FFC618083\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk49d32553fc20.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D7687342371051\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdkd5035369c18d.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk49d32553fc20.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azs-sdkd5035369c18d.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk49d32553fc20.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "14",
+      "elapsed-time" : "20",
       "Expires" : "-1",
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "8677e53f-e094-473e-a1e0-d9d5fb58265a",
+      "request-id" : "e3c35945-338d-4807-8101-603b9decad85",
       "StatusCode" : "204",
-      "Date" : "Wed, 06 Nov 2019 00:26:36 GMT"
+      "Date" : "Wed, 13 Nov 2019 19:54:13 GMT"
     },
     "Exception" : null
   }, {
     "Method" : "DELETE",
-    "Uri" : "https://azs-sdkd5035369c18d.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk49d32553fc20.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "c198094a-925c-411c-aa32-ce5d9e05bcce",
+      "request-id" : "c38dc14a-da93-47ca-9368-af402ae8bf58",
       "StatusCode" : "404",
-      "Date" : "Wed, 06 Nov 2019 00:26:36 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:13 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "6",
+      "elapsed-time" : "5",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "128",
-      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonymMap with the name 'test-synonym' was found in a service named 'azs-sdkd5035369c18d'.\"}}",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonymMap with the name 'test-synonym' was found in a service named 'azs-sdk49d32553fc20'.\"}}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Language" : "en",
       "Content-Type" : "application/json; odata.metadata=minimal"
diff --git a/sdk/search/azure-search/src/test/resources/session-records/existsReturnsFalseForNonExistingSynonymMap.json b/sdk/search/azure-search/src/test/resources/session-records/existsReturnsFalseForNonExistingSynonymMap.json
index 8906e870500d3..b802f44ccf0f2 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/existsReturnsFalseForNonExistingSynonymMap.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/existsReturnsFalseForNonExistingSynonymMap.json
@@ -1,21 +1,21 @@
 {
   "networkCallRecords" : [ {
     "Method" : "GET",
-    "Uri" : "https://azs-sdkb01486379a06.search.windows.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk2983474237b2.search-dogfood.windows-int.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "50d1a7f8-1a1f-48d5-a966-ee9533fef79f",
+      "request-id" : "41500ede-0d5c-4739-88b5-7dd5ab36d58a",
       "StatusCode" : "404",
-      "Date" : "Wed, 30 Oct 2019 00:35:58 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:53 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "31",
+      "elapsed-time" : "29",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "135",
-      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdkb01486379a06'.\"}}",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk2983474237b2'.\"}}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Language" : "en",
       "Content-Type" : "application/json; odata.metadata=minimal"
@@ -23,21 +23,21 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdkb01486379a06.search.windows.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk2983474237b2.search-dogfood.windows-int.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "95416ba8-87a7-49f3-9d42-ad5335a07018",
+      "request-id" : "db7fc504-2c84-4d5c-a8c6-6a1a6ee20837",
       "StatusCode" : "404",
-      "Date" : "Wed, 30 Oct 2019 00:35:58 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:53 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
       "elapsed-time" : "5",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "135",
-      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdkb01486379a06'.\"}}",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk2983474237b2'.\"}}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Language" : "en",
       "Content-Type" : "application/json; odata.metadata=minimal"
@@ -45,21 +45,21 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdkb01486379a06.search.windows.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk2983474237b2.search-dogfood.windows-int.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "95416ba8-87a7-49f3-9d42-ad5335a07018",
+      "request-id" : "e6f3f63d-45f6-409e-8a69-095078de17bd",
       "StatusCode" : "404",
-      "Date" : "Wed, 30 Oct 2019 00:35:58 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:53 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "4",
+      "elapsed-time" : "6",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "135",
-      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdkb01486379a06'.\"}}",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk2983474237b2'.\"}}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Language" : "en",
       "Content-Type" : "application/json; odata.metadata=minimal"
diff --git a/sdk/search/azure-search/src/test/resources/session-records/existsReturnsTrueForExistingSynonymMap.json b/sdk/search/azure-search/src/test/resources/session-records/existsReturnsTrueForExistingSynonymMap.json
index 7b332c0164061..ab56af6e7a177 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/existsReturnsTrueForExistingSynonymMap.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/existsReturnsTrueForExistingSynonymMap.json
@@ -1,91 +1,91 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://azs-sdkbf09249480b7.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk203785895455.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "3ee38fc8-fd66-4a0d-8cae-9617e74ee1f2",
+      "request-id" : "4f374072-57e1-4d79-bced-968d30b51929",
       "StatusCode" : "201",
-      "Date" : "Wed, 30 Oct 2019 00:37:21 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:45 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CD15341222C\"",
-      "elapsed-time" : "61",
+      "ETag" : "W/\"0x8D768735540CCAE\"",
+      "elapsed-time" : "37",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkbf09249480b7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CD15341222C\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk203785895455.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768735540CCAE\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdkbf09249480b7.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk203785895455.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdkbf09249480b7.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk203785895455.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "5abc08d2-40c2-46c8-9604-e4748bda0622",
+      "request-id" : "d34126b9-b9dc-4450-80e6-2d8fd6601f62",
       "StatusCode" : "200",
-      "Date" : "Wed, 30 Oct 2019 00:37:21 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:45 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CD15341222C\"",
-      "elapsed-time" : "8",
+      "ETag" : "W/\"0x8D768735540CCAE\"",
+      "elapsed-time" : "6",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkbf09249480b7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CD15341222C\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk203785895455.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768735540CCAE\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdkbf09249480b7.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk203785895455.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "4e802b09-b043-46e0-ac44-ae4b2ed2114e",
+      "request-id" : "51d5e839-4a56-4e0c-8610-f1e33975ea92",
       "StatusCode" : "200",
-      "Date" : "Wed, 30 Oct 2019 00:37:21 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:45 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CD15341222C\"",
+      "ETag" : "W/\"0x8D768735540CCAE\"",
       "elapsed-time" : "6",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkbf09249480b7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CD15341222C\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk203785895455.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768735540CCAE\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdkbf09249480b7.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk203785895455.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "4e802b09-b043-46e0-ac44-ae4b2ed2114e",
+      "request-id" : "bd1481e4-9939-4074-bfe1-4af3aefdecce",
       "StatusCode" : "200",
-      "Date" : "Wed, 30 Oct 2019 00:37:21 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:45 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CD15341222C\"",
+      "ETag" : "W/\"0x8D768735540CCAE\"",
       "elapsed-time" : "5",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdkbf09249480b7.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CD15341222C\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk203785895455.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D768735540CCAE\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
diff --git a/sdk/search/azure-search/src/test/resources/session-records/getSynonymMapReturnsCorrectDefinition.json b/sdk/search/azure-search/src/test/resources/session-records/getSynonymMapReturnsCorrectDefinition.json
index 69dcb4f259ed9..f46d0d1fcb541 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/getSynonymMapReturnsCorrectDefinition.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/getSynonymMapReturnsCorrectDefinition.json
@@ -1,91 +1,91 @@
 {
   "networkCallRecords" : [ {
     "Method" : "POST",
-    "Uri" : "https://azs-sdk8ff17125c144.search.windows.net/synonymmaps?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk0a5244992c37.search-dogfood.windows-int.net/synonymmaps?api-version=2019-05-06",
     "Headers" : {
       "Content-Type" : "application/json; charset=utf-8"
     },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "fb385bcb-6c8a-4fb8-b682-5882a9a40a44",
+      "request-id" : "c615f578-3605-4beb-8c99-993baa5f0f85",
       "StatusCode" : "201",
-      "Date" : "Tue, 29 Oct 2019 23:42:56 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:39 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CC9B955E2C5\"",
-      "elapsed-time" : "39",
+      "ETag" : "W/\"0x8D76873516ED093\"",
+      "elapsed-time" : "43",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk8ff17125c144.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CC9B955E2C5\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk0a5244992c37.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D76873516ED093\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal",
-      "Location" : "https://azs-sdk8ff17125c144.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06"
+      "Location" : "https://azs-sdk0a5244992c37.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk8ff17125c144.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk0a5244992c37.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "28aafb5d-9c03-426c-a881-e1bc88ef9eba",
+      "request-id" : "c36600b5-238c-462c-a647-10b24dcd6f36",
       "StatusCode" : "200",
-      "Date" : "Tue, 29 Oct 2019 23:42:56 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:39 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CC9B955E2C5\"",
-      "elapsed-time" : "22",
+      "ETag" : "W/\"0x8D76873516ED093\"",
+      "elapsed-time" : "6",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk8ff17125c144.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CC9B955E2C5\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk0a5244992c37.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D76873516ED093\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk8ff17125c144.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk0a5244992c37.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "c7bd1cd6-a767-46cd-9313-0d56e93d4159",
+      "request-id" : "c3354c0d-bdd8-4a6d-b695-6cd3f47f8c8e",
       "StatusCode" : "200",
-      "Date" : "Tue, 29 Oct 2019 23:42:56 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:39 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CC9B955E2C5\"",
-      "elapsed-time" : "6",
+      "ETag" : "W/\"0x8D76873516ED093\"",
+      "elapsed-time" : "5",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk8ff17125c144.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CC9B955E2C5\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk0a5244992c37.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D76873516ED093\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk8ff17125c144.search.windows.net/synonymmaps('test-synonym')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk0a5244992c37.search-dogfood.windows-int.net/synonymmaps('test-synonym')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "c7bd1cd6-a767-46cd-9313-0d56e93d4159",
+      "request-id" : "95547a5e-71de-4f21-9184-db55de0cd55b",
       "StatusCode" : "200",
-      "Date" : "Tue, 29 Oct 2019 23:42:56 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:54:39 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "ETag" : "W/\"0x8D75CC9B955E2C5\"",
+      "ETag" : "W/\"0x8D76873516ED093\"",
       "elapsed-time" : "5",
       "OData-Version" : "4.0",
       "Expires" : "-1",
-      "Content-Length" : "198",
-      "Body" : "{\"@odata.context\":\"https://azs-sdk8ff17125c144.search.windows.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D75CC9B955E2C5\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
+      "Content-Length" : "210",
+      "Body" : "{\"@odata.context\":\"https://azs-sdk0a5244992c37.search-dogfood.windows-int.net/$metadata#synonymmaps/$entity\",\"@odata.etag\":\"\\\"0x8D76873516ED093\\\"\",\"name\":\"test-synonym\",\"format\":\"solr\",\"synonyms\":\"word1,word2\"}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Type" : "application/json; odata.metadata=minimal"
     },
diff --git a/sdk/search/azure-search/src/test/resources/session-records/getSynonymMapThrowsOnNotFound.json b/sdk/search/azure-search/src/test/resources/session-records/getSynonymMapThrowsOnNotFound.json
index adb1f2907ca09..30f3d48348c00 100644
--- a/sdk/search/azure-search/src/test/resources/session-records/getSynonymMapThrowsOnNotFound.json
+++ b/sdk/search/azure-search/src/test/resources/session-records/getSynonymMapThrowsOnNotFound.json
@@ -1,21 +1,21 @@
 {
   "networkCallRecords" : [ {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk402260962364.search.windows.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk09a1562136ad.search-dogfood.windows-int.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "3bfab1dd-9cdf-4fa2-9282-f3ed565dff7e",
+      "request-id" : "14dead0f-7cb7-440a-8700-9e1b3e6e1dcd",
       "StatusCode" : "404",
-      "Date" : "Tue, 29 Oct 2019 23:42:37 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:33 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "42",
+      "elapsed-time" : "26",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "135",
-      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk402260962364'.\"}}",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk09a1562136ad'.\"}}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Language" : "en",
       "Content-Type" : "application/json; odata.metadata=minimal"
@@ -23,21 +23,21 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk402260962364.search.windows.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk09a1562136ad.search-dogfood.windows-int.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "6defe703-70ba-43c6-99f5-6bf34b963c22",
+      "request-id" : "42cb65e0-85fe-48ad-a502-1333c24fd9d4",
       "StatusCode" : "404",
-      "Date" : "Tue, 29 Oct 2019 23:42:37 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:35 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
       "elapsed-time" : "5",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "135",
-      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk402260962364'.\"}}",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk09a1562136ad'.\"}}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Language" : "en",
       "Content-Type" : "application/json; odata.metadata=minimal"
@@ -45,43 +45,21 @@
     "Exception" : null
   }, {
     "Method" : "GET",
-    "Uri" : "https://azs-sdk402260962364.search.windows.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
+    "Uri" : "https://azs-sdk09a1562136ad.search-dogfood.windows-int.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
     "Headers" : { },
     "Response" : {
       "Pragma" : "no-cache",
       "retry-after" : "0",
-      "request-id" : "6defe703-70ba-43c6-99f5-6bf34b963c22",
+      "request-id" : "8b6d77bf-af32-448a-a47f-9ce2baf5e14a",
       "StatusCode" : "404",
-      "Date" : "Tue, 29 Oct 2019 23:42:37 GMT",
+      "Date" : "Wed, 13 Nov 2019 19:53:35 GMT",
       "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
       "Cache-Control" : "no-cache",
-      "elapsed-time" : "4",
+      "elapsed-time" : "10",
       "OData-Version" : "4.0",
       "Expires" : "-1",
       "Content-Length" : "135",
-      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk402260962364'.\"}}",
-      "Preference-Applied" : "odata.include-annotations=\"*\"",
-      "Content-Language" : "en",
-      "Content-Type" : "application/json; odata.metadata=minimal"
-    },
-    "Exception" : null
-  }, {
-    "Method" : "GET",
-    "Uri" : "https://azs-sdk402260962364.search.windows.net/synonymmaps('thisSynonymMapDoesNotExist')?api-version=2019-05-06",
-    "Headers" : { },
-    "Response" : {
-      "Pragma" : "no-cache",
-      "retry-after" : "0",
-      "request-id" : "6defe703-70ba-43c6-99f5-6bf34b963c22",
-      "StatusCode" : "404",
-      "Date" : "Tue, 29 Oct 2019 23:42:37 GMT",
-      "Strict-Transport-Security" : "max-age=15724800; includeSubDomains",
-      "Cache-Control" : "no-cache",
-      "elapsed-time" : "5",
-      "OData-Version" : "4.0",
-      "Expires" : "-1",
-      "Content-Length" : "135",
-      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk402260962364'.\"}}",
+      "Body" : "{\"error\":{\"code\":\"\",\"message\":\"No synonym map with the name 'thisSynonymMapDoesNotExist' was found in service 'azs-sdk09a1562136ad'.\"}}",
       "Preference-Applied" : "odata.include-annotations=\"*\"",
       "Content-Language" : "en",
       "Content-Type" : "application/json; odata.metadata=minimal"