diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2015-02-28-preview/searchindex.json b/specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2015-02-28-preview/searchindex.json
similarity index 100%
rename from specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2015-02-28-preview/searchindex.json
rename to specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2015-02-28-preview/searchindex.json
diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2015-02-28/searchindex.json b/specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2015-02-28/searchindex.json
similarity index 100%
rename from specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2015-02-28/searchindex.json
rename to specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2015-02-28/searchindex.json
diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2016-09-01-preview/examples/SearchIndexCountDocuments.json b/specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2016-09-01-preview/examples/SearchIndexCountDocuments.json
similarity index 100%
rename from specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2016-09-01-preview/examples/SearchIndexCountDocuments.json
rename to specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2016-09-01-preview/examples/SearchIndexCountDocuments.json
diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2016-09-01-preview/searchindex.json b/specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2016-09-01-preview/searchindex.json
similarity index 100%
rename from specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2016-09-01-preview/searchindex.json
rename to specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2016-09-01-preview/searchindex.json
diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2016-09-01/searchindex.json b/specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2016-09-01/searchindex.json
similarity index 100%
rename from specification/search/data-plane/Microsoft.Azure.Search.Index/preview/2016-09-01/searchindex.json
rename to specification/search/data-plane/Microsoft.Azure.Search.Data/preview/2016-09-01/searchindex.json
diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Index/readme.md b/specification/search/data-plane/Microsoft.Azure.Search.Data/readme.md
similarity index 98%
rename from specification/search/data-plane/Microsoft.Azure.Search.Index/readme.md
rename to specification/search/data-plane/Microsoft.Azure.Search.Data/readme.md
index 5bbb2d36beda..770c998c0f52 100644
--- a/specification/search/data-plane/Microsoft.Azure.Search.Index/readme.md
+++ b/specification/search/data-plane/Microsoft.Azure.Search.Data/readme.md
@@ -82,5 +82,5 @@ csharp:
   license-header: MICROSOFT_MIT_NO_VERSION
   namespace: Microsoft.Azure.Search
   clear-output-folder: true
-  output-folder: $(csharp-sdks-folder)/Search/DataPlane/Microsoft.Azure.Search/GeneratedSearchIndex
+  output-folder: $(csharp-sdks-folder)/Search/DataPlane/Microsoft.Azure.Search.Data/Generated
 ```
diff --git a/specification/search/data-plane/Microsoft.Azure.Search.Service/readme.md b/specification/search/data-plane/Microsoft.Azure.Search.Service/readme.md
index 18292cc841ae..1857949fe668 100644
--- a/specification/search/data-plane/Microsoft.Azure.Search.Service/readme.md
+++ b/specification/search/data-plane/Microsoft.Azure.Search.Service/readme.md
@@ -82,5 +82,5 @@ csharp:
   license-header: MICROSOFT_MIT_NO_VERSION
   namespace: Microsoft.Azure.Search
   clear-output-folder: true
-  output-folder: $(csharp-sdks-folder)/Search/DataPlane/Microsoft.Azure.Search/GeneratedSearchService
+  output-folder: $(csharp-sdks-folder)/Search/DataPlane/Microsoft.Azure.Search.Service/Generated
 ```