diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.sln b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomSearch.sln
similarity index 78%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.sln
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomSearch.sln
index a2ea8fb19e4f..f10e9c08486d 100644
--- a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.sln
+++ b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomSearch.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.CognitiveServices.Search.CustomSearch", "BingCustomSearch\Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj", "{6807B854-8528-4FEE-A25D-C43C3AA2D601}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.CognitiveServices.Search.CustomSearch", "BingCustomWebSearch\Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj", "{6807B854-8528-4FEE-A25D-C43C3AA2D601}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests", "BingCustomSearch.Tests\Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj", "{5987D97A-E532-450C-BF22-A1F595C927F1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests", "BingCustomWebSearch.Tests\Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj", "{5987D97A-E532-450C-BF22-A1F595C927F1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/CustomSearchTests.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch.Tests/CustomSearchTests.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/CustomSearchTests.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch.Tests/CustomSearchTests.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj
similarity index 88%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj
index 3d48d0b7de04..78d759e4bc2f 100644
--- a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj
+++ b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch.Tests/Microsoft.Azure.CognitiveServices.Search.CustomSearch.Tests.csproj
@@ -12,7 +12,7 @@
   
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
-    <ProjectReference Include="..\BingCustomSearch\Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj" />
+    <ProjectReference Include="..\BingCustomWebSearch\Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/SessionRecords/SearchSDK.Tests.CustomSearchTests/CustomSearch.json b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch.Tests/SessionRecords/SearchSDK.Tests.CustomSearchTests/CustomSearch.json
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch.Tests/SessionRecords/SearchSDK.Tests.CustomSearchTests/CustomSearch.json
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch.Tests/SessionRecords/SearchSDK.Tests.CustomSearchTests/CustomSearch.json
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Customizations/ApiKeyServiceClientCredentials.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Customizations/ApiKeyServiceClientCredentials.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Customizations/ApiKeyServiceClientCredentials.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Customizations/ApiKeyServiceClientCredentials.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomInstance.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/CustomInstance.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomInstance.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/CustomInstance.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomInstanceExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/CustomInstanceExtensions.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomInstanceExtensions.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/CustomInstanceExtensions.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/CustomSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/CustomSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/CustomSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/ICustomInstance.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/ICustomInstance.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/ICustomInstance.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/ICustomInstance.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/ICustomSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/ICustomSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/ICustomSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/ICustomSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Answer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Answer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Answer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Answer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/CreativeWork.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/CreativeWork.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/CreativeWork.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/CreativeWork.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Error.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Error.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Error.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Error.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ErrorCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ErrorCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ErrorResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ErrorResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponseException.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ErrorResponseException.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorResponseException.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ErrorResponseException.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorSubCode.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ErrorSubCode.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ErrorSubCode.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ErrorSubCode.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Identifiable.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Identifiable.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Identifiable.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Identifiable.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Query.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Query.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Query.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Query.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/QueryContext.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/QueryContext.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/QueryContext.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/QueryContext.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Response.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Response.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Response.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Response.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ResponseBase.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ResponseBase.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/ResponseBase.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/ResponseBase.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SafeSearch.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/SafeSearch.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SafeSearch.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/SafeSearch.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SearchResponse.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/SearchResponse.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SearchResponse.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/SearchResponse.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SearchResultsAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/SearchResultsAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/SearchResultsAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/SearchResultsAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/TextFormat.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/TextFormat.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/TextFormat.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/TextFormat.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Thing.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Thing.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/Thing.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/Thing.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebMetaTag.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/WebMetaTag.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebMetaTag.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/WebMetaTag.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebPage.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/WebPage.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebPage.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/WebPage.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebWebAnswer.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/WebWebAnswer.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/Models/WebWebAnswer.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/Models/WebWebAnswer.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/SdkInfo_CustomSearchAPI.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/SdkInfo_CustomSearchAPI.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Generated/CustomSearch/SdkInfo_CustomSearchAPI.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Generated/CustomSearch/SdkInfo_CustomSearchAPI.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Microsoft.Azure.CognitiveServices.Search.CustomSearch.csproj
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Properties/AssemblyInfo.cs b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/Properties/AssemblyInfo.cs
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/Properties/AssemblyInfo.cs
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/generate.cmd b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/generate.cmd
similarity index 85%
rename from src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/generate.cmd
rename to src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/generate.cmd
index 6f9fd5928e8e..2e14f4a1527e 100644
--- a/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomSearch/BingCustomSearch/generate.cmd
+++ b/src/SDKs/CognitiveServices/dataPlane/Search/BingCustomWebSearch/BingCustomWebSearch/generate.cmd
@@ -4,4 +4,4 @@
 ::
 
 @echo off
-call %~dp0..\..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/CustomSearch %*
\ No newline at end of file
+call %~dp0..\..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/CustomWebSearch %*