Use modern syntax

89 files changed, 98 insertions, 100 deletions

diff --git a/config-model/src/test/derived/advanced/advanced.sd b/config-model/src/test/derived/advanced/advanced.sd
index 928e74160b9..69ea3a529b4 100644
--- a/config-model/src/test/derived/advanced/advanced.sd
+++ b/config-model/src/test/derived/advanced/advanced.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search advanced {
+schema advanced {
     document advanced {
         field debug_src      type string { }
         field attributes_src type string { }
diff --git a/config-model/src/test/derived/annotationsimplicitstruct/annotationsimplicitstruct.sd b/config-model/src/test/derived/annotationsimplicitstruct/annotationsimplicitstruct.sd
index 5ac7ac38a90..fd407a68ea3 100755
--- a/config-model/src/test/derived/annotationsimplicitstruct/annotationsimplicitstruct.sd
+++ b/config-model/src/test/derived/annotationsimplicitstruct/annotationsimplicitstruct.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationsimplicitstruct {
+schema annotationsimplicitstruct {
 
   document annotationsimplicitstruct {
 
diff --git a/config-model/src/test/derived/annotationsinheritance/annotationsinheritance.sd b/config-model/src/test/derived/annotationsinheritance/annotationsinheritance.sd
index a0f1787228d..256fb98ae8a 100755
--- a/config-model/src/test/derived/annotationsinheritance/annotationsinheritance.sd
+++ b/config-model/src/test/derived/annotationsinheritance/annotationsinheritance.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationsinheritance {
+schema annotationsinheritance {
 
   document annotationsinheritance {
 
diff --git a/config-model/src/test/derived/annotationsinheritance2/annotationsinheritance2.sd b/config-model/src/test/derived/annotationsinheritance2/annotationsinheritance2.sd
index 2abb84d9b9f..f6f30bf6aad 100755
--- a/config-model/src/test/derived/annotationsinheritance2/annotationsinheritance2.sd
+++ b/config-model/src/test/derived/annotationsinheritance2/annotationsinheritance2.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationsinheritance2 {
+schema annotationsinheritance2 {
 
   document annotationsinheritance2 {
   
diff --git a/config-model/src/test/derived/annotationsoutsideofdocument/annotationsoutsideofdocument.sd b/config-model/src/test/derived/annotationsoutsideofdocument/annotationsoutsideofdocument.sd
index 017b574fb89..6be5d3401ce 100644
--- a/config-model/src/test/derived/annotationsoutsideofdocument/annotationsoutsideofdocument.sd
+++ b/config-model/src/test/derived/annotationsoutsideofdocument/annotationsoutsideofdocument.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationsoutsideofdocument {
+schema annotationsoutsideofdocument {
 
 # (will fail)
 
diff --git a/config-model/src/test/derived/annotationspolymorphy/annotationspolymorphy.sd b/config-model/src/test/derived/annotationspolymorphy/annotationspolymorphy.sd
index b02cf5a88ea..52e17cc19b5 100644
--- a/config-model/src/test/derived/annotationspolymorphy/annotationspolymorphy.sd
+++ b/config-model/src/test/derived/annotationspolymorphy/annotationspolymorphy.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationspolymorphy {
+schema annotationspolymorphy {
 
   document annotationspolymorphy {
 
diff --git a/config-model/src/test/derived/annotationsreference/annotationsreference.sd b/config-model/src/test/derived/annotationsreference/annotationsreference.sd
index a0e2af3c6f5..eb1923494ac 100755
--- a/config-model/src/test/derived/annotationsreference/annotationsreference.sd
+++ b/config-model/src/test/derived/annotationsreference/annotationsreference.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationsreference {
+schema annotationsreference {
 
   document annotationsreference {
 
diff --git a/config-model/src/test/derived/annotationsreference2/annotationsreference2.sd b/config-model/src/test/derived/annotationsreference2/annotationsreference2.sd
index 6f00d6aa6ee..f91e25a2563 100644
--- a/config-model/src/test/derived/annotationsreference2/annotationsreference2.sd
+++ b/config-model/src/test/derived/annotationsreference2/annotationsreference2.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationreference2 {
+schema annotationreference2 {
     document annotationreference2 {
         annotation foo { }
         annotation bar {
diff --git a/config-model/src/test/derived/annotationssimple/annotationssimple.sd b/config-model/src/test/derived/annotationssimple/annotationssimple.sd
index 8ace7165cba..1282dee9f12 100755
--- a/config-model/src/test/derived/annotationssimple/annotationssimple.sd
+++ b/config-model/src/test/derived/annotationssimple/annotationssimple.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationssimple {
+schema annotationssimple {
 
   document annotationssimple {
   annotation banana { }
diff --git a/config-model/src/test/derived/annotationsstruct/annotationsstruct.sd b/config-model/src/test/derived/annotationsstruct/annotationsstruct.sd
index ae9bd896af7..64b13dc434e 100644
--- a/config-model/src/test/derived/annotationsstruct/annotationsstruct.sd
+++ b/config-model/src/test/derived/annotationsstruct/annotationsstruct.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationsstruct {
+schema annotationsstruct {
     document annotationsstruct {
         struct my_struct {
             field my_structfield type string { }
diff --git a/config-model/src/test/derived/annotationsstructarray/annotationsstructarray.sd b/config-model/src/test/derived/annotationsstructarray/annotationsstructarray.sd
index 44d77caf0d5..e153951a2c1 100644
--- a/config-model/src/test/derived/annotationsstructarray/annotationsstructarray.sd
+++ b/config-model/src/test/derived/annotationsstructarray/annotationsstructarray.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationsstructarray {
+schema annotationsstructarray {
     document annotationsstructarray {
         struct my_struct {
             field my_structfield type string { }
diff --git a/config-model/src/test/derived/array_of_struct_attribute/test.sd b/config-model/src/test/derived/array_of_struct_attribute/test.sd
index 2846c3be13d..2f7c7755ca5 100644
--- a/config-model/src/test/derived/array_of_struct_attribute/test.sd
+++ b/config-model/src/test/derived/array_of_struct_attribute/test.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
+schema test {
   document test {
     struct elem {
       field name type string {}
diff --git a/config-model/src/test/derived/arrays/arrays.sd b/config-model/src/test/derived/arrays/arrays.sd
index 43aa9c24888..1a6c4b07fc2 100644
--- a/config-model/src/test/derived/arrays/arrays.sd
+++ b/config-model/src/test/derived/arrays/arrays.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search arrays {
+schema arrays {
 
   document arrays {
 
diff --git a/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd b/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd
index 296a1fd828d..a0746ea7dcb 100644
--- a/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd
+++ b/config-model/src/test/derived/attributeprefetch/attributeprefetch.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search prefetch {
+schema prefetch {
   document prefetch {
     field singlebyte type byte {
       indexing: attribute
diff --git a/config-model/src/test/derived/attributerank/attributerank.sd b/config-model/src/test/derived/attributerank/attributerank.sd
index 4989e1795cd..6d6ee4e8bb1 100644
--- a/config-model/src/test/derived/attributerank/attributerank.sd
+++ b/config-model/src/test/derived/attributerank/attributerank.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search attributerank {
+schema attributerank {
 
   document attributerank {
 
diff --git a/config-model/src/test/derived/attributes/attributes.sd b/config-model/src/test/derived/attributes/attributes.sd
index df647c833f4..2827afc2d42 100644
--- a/config-model/src/test/derived/attributes/attributes.sd
+++ b/config-model/src/test/derived/attributes/attributes.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search attributes {
+schema attributes {
 
   document attributes {
 
diff --git a/config-model/src/test/derived/combinedattributeandindexsearch/combinedattributeandindexsearch.sd b/config-model/src/test/derived/combinedattributeandindexsearch/combinedattributeandindexsearch.sd
index 8e28c3b6311..c9a76b27101 100644
--- a/config-model/src/test/derived/combinedattributeandindexsearch/combinedattributeandindexsearch.sd
+++ b/config-model/src/test/derived/combinedattributeandindexsearch/combinedattributeandindexsearch.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search combinedattributeandindexsearch {
+schema combinedattributeandindexsearch {
 
   document combinedattributeandindexsearch {
 
diff --git a/config-model/src/test/derived/complex/complex.sd b/config-model/src/test/derived/complex/complex.sd
index 844d09a529d..3dcea95ed72 100644
--- a/config-model/src/test/derived/complex/complex.sd
+++ b/config-model/src/test/derived/complex/complex.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search complex {
+schema complex {
 
   document complex {
 
diff --git a/config-model/src/test/derived/declstruct/bar.sd b/config-model/src/test/derived/declstruct/bar.sd
index 7f7d06d5af7..9a415c1a12c 100644
--- a/config-model/src/test/derived/declstruct/bar.sd
+++ b/config-model/src/test/derived/declstruct/bar.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search bar {
+schema bar {
     document bar inherits common {
         struct mystructinbar {
             field f2 type string { }
diff --git a/config-model/src/test/derived/declstruct/foo.sd b/config-model/src/test/derived/declstruct/foo.sd
index 6470671f437..56ea6ac4f0d 100644
--- a/config-model/src/test/derived/declstruct/foo.sd
+++ b/config-model/src/test/derived/declstruct/foo.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search foo {
+schema foo {
     document foo inherits common {
         struct mystructinfoo {
             field f1 type string { }
diff --git a/config-model/src/test/derived/declstruct/foobar.sd b/config-model/src/test/derived/declstruct/foobar.sd
index cc05444249b..bddd19e4cde 100644
--- a/config-model/src/test/derived/declstruct/foobar.sd
+++ b/config-model/src/test/derived/declstruct/foobar.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search foobar {
+schema foobar {
     document foobar inherits foo, bar {
         struct mystructinfoobar {
             field f3 type string { }
diff --git a/config-model/src/test/derived/deriver/child.sd b/config-model/src/test/derived/deriver/child.sd
index 5e63a54f690..b829cd9a81d 100644
--- a/config-model/src/test/derived/deriver/child.sd
+++ b/config-model/src/test/derived/deriver/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
 
   document child inherits parent {
 
diff --git a/config-model/src/test/derived/deriver/grandparent.sd b/config-model/src/test/derived/deriver/grandparent.sd
index f1105bf3f43..2cf540a6f1e 100644
--- a/config-model/src/test/derived/deriver/grandparent.sd
+++ b/config-model/src/test/derived/deriver/grandparent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search grandparent {
+schema grandparent {
 
   document grandparent {
 
diff --git a/config-model/src/test/derived/deriver/parent.sd b/config-model/src/test/derived/deriver/parent.sd
index 6cf930513e4..9379301601c 100644
--- a/config-model/src/test/derived/deriver/parent.sd
+++ b/config-model/src/test/derived/deriver/parent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent {
+schema parent {
 
   document parent inherits grandparent {
 
diff --git a/config-model/src/test/derived/duplicate_struct/foo.sd b/config-model/src/test/derived/duplicate_struct/foo.sd
index 8447b0440cb..4eda86f70bd 100644
--- a/config-model/src/test/derived/duplicate_struct/foo.sd
+++ b/config-model/src/test/derived/duplicate_struct/foo.sd
@@ -1,6 +1,6 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search foo {
+schema foo {
   document foo {
     field timestamp type long {
       indexing: summary | attribute
diff --git a/config-model/src/test/derived/duplicate_struct/foobar.sd b/config-model/src/test/derived/duplicate_struct/foobar.sd
index 7ef4fb5dbe1..feb06852072 100644
--- a/config-model/src/test/derived/duplicate_struct/foobar.sd
+++ b/config-model/src/test/derived/duplicate_struct/foobar.sd
@@ -1,6 +1,6 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search foobar {
+schema foobar {
   document foobar inherits foo {
     field title type string {
       indexing: summary | index
diff --git a/config-model/src/test/derived/emptychild/child.sd b/config-model/src/test/derived/emptychild/child.sd
index 814899363d7..718a8561ab8 100644
--- a/config-model/src/test/derived/emptychild/child.sd
+++ b/config-model/src/test/derived/emptychild/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
   document child inherits parent {
   }
 }
diff --git a/config-model/src/test/derived/emptychild/parent.sd b/config-model/src/test/derived/emptychild/parent.sd
index 8c1754f54c9..f304a8f7633 100644
--- a/config-model/src/test/derived/emptychild/parent.sd
+++ b/config-model/src/test/derived/emptychild/parent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent {
+schema parent {
   document parent {
     field a1 type string {
       indexing: attribute | summary
diff --git a/config-model/src/test/derived/emptydefault/emptydefault.sd b/config-model/src/test/derived/emptydefault/emptydefault.sd
index 5f317fe2b7f..9d32069d473 100644
--- a/config-model/src/test/derived/emptydefault/emptydefault.sd
+++ b/config-model/src/test/derived/emptydefault/emptydefault.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search emptydefault {
+schema emptydefault {
 
   document emptydefault {
 
diff --git a/config-model/src/test/derived/exactmatch/exactmatch.sd b/config-model/src/test/derived/exactmatch/exactmatch.sd
index e6e002d5449..ceeb48ad252 100644
--- a/config-model/src/test/derived/exactmatch/exactmatch.sd
+++ b/config-model/src/test/derived/exactmatch/exactmatch.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search exactmatch {
+schema exactmatch {
 
   document exactmatch {
 
diff --git a/config-model/src/test/derived/fieldset/test.sd b/config-model/src/test/derived/fieldset/test.sd
index a3244751551..6bdc5e73cce 100644
--- a/config-model/src/test/derived/fieldset/test.sd
+++ b/config-model/src/test/derived/fieldset/test.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
+schema test {
 
     document test {
 
diff --git a/config-model/src/test/derived/flickr/flickrphotos.sd b/config-model/src/test/derived/flickr/flickrphotos.sd
index a7680067a53..8d021fe1c9b 100755
--- a/config-model/src/test/derived/flickr/flickrphotos.sd
+++ b/config-model/src/test/derived/flickr/flickrphotos.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search flickrphotos{
+schema flickrphotos{
 
    #Document summary to use for attribute-prefetching with many hits
 
diff --git a/config-model/src/test/derived/function_arguments/test.sd b/config-model/src/test/derived/function_arguments/test.sd
index a502c25adb0..8e54d07dee7 100644
--- a/config-model/src/test/derived/function_arguments/test.sd
+++ b/config-model/src/test/derived/function_arguments/test.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search args {
+schema args {
 
     document args {
         field f1 type float {
diff --git a/config-model/src/test/derived/function_arguments_with_expressions/test.sd b/config-model/src/test/derived/function_arguments_with_expressions/test.sd
index a4d3d5bfdae..14aeebca641 100644
--- a/config-model/src/test/derived/function_arguments_with_expressions/test.sd
+++ b/config-model/src/test/derived/function_arguments_with_expressions/test.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
+schema test {
 
     document test {
         field i1 type int {
diff --git a/config-model/src/test/derived/gemini2/gemini.sd b/config-model/src/test/derived/gemini2/gemini.sd
index 0dc413a0957..366823df04f 100644
--- a/config-model/src/test/derived/gemini2/gemini.sd
+++ b/config-model/src/test/derived/gemini2/gemini.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search gemini {
+schema gemini {
 
     document gemini {
         field right type string {
diff --git a/config-model/src/test/derived/hnsw_index/test.sd b/config-model/src/test/derived/hnsw_index/test.sd
index a56b2fa2fcc..066c66df298 100644
--- a/config-model/src/test/derived/hnsw_index/test.sd
+++ b/config-model/src/test/derived/hnsw_index/test.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
+schema test {
   document test {
     field t1 type tensor(x[128]) {
       indexing: attribute | index
diff --git a/config-model/src/test/derived/id/id.sd b/config-model/src/test/derived/id/id.sd
index bab549218f2..44c29cf1104 100644
--- a/config-model/src/test/derived/id/id.sd
+++ b/config-model/src/test/derived/id/id.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search id {
+schema id {
   
   document id {
     
diff --git a/config-model/src/test/derived/imported_position_field/child.sd b/config-model/src/test/derived/imported_position_field/child.sd
index 908eb417807..d1769c6c7a5 100644
--- a/config-model/src/test/derived/imported_position_field/child.sd
+++ b/config-model/src/test/derived/imported_position_field/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
   document child {
     field parent_ref type reference<parent> {
       indexing: attribute | summary
diff --git a/config-model/src/test/derived/imported_position_field/parent.sd b/config-model/src/test/derived/imported_position_field/parent.sd
index 5f1710cb176..a50092e6ed9 100644
--- a/config-model/src/test/derived/imported_position_field/parent.sd
+++ b/config-model/src/test/derived/imported_position_field/parent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent {
+schema parent {
     document parent {
         field pos type position {
             indexing: attribute | summary
diff --git a/config-model/src/test/derived/imported_position_field_summary/child.sd b/config-model/src/test/derived/imported_position_field_summary/child.sd
index 45a8001b055..52272f91862 100644
--- a/config-model/src/test/derived/imported_position_field_summary/child.sd
+++ b/config-model/src/test/derived/imported_position_field_summary/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
   document child {
     field parent_ref type reference<parent> {
       indexing: attribute | summary
diff --git a/config-model/src/test/derived/imported_position_field_summary/parent.sd b/config-model/src/test/derived/imported_position_field_summary/parent.sd
index 5f1710cb176..a50092e6ed9 100644
--- a/config-model/src/test/derived/imported_position_field_summary/parent.sd
+++ b/config-model/src/test/derived/imported_position_field_summary/parent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent {
+schema parent {
     document parent {
         field pos type position {
             indexing: attribute | summary
diff --git a/config-model/src/test/derived/imported_struct_fields/child.sd b/config-model/src/test/derived/imported_struct_fields/child.sd
index b6b2bb4b444..c83eac6aa83 100644
--- a/config-model/src/test/derived/imported_struct_fields/child.sd
+++ b/config-model/src/test/derived/imported_struct_fields/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
   document child {
     field parent_ref type reference<parent> {
       indexing: attribute | summary
diff --git a/config-model/src/test/derived/imported_struct_fields/parent.sd b/config-model/src/test/derived/imported_struct_fields/parent.sd
index 5e3f248b748..1faabfc1a0e 100644
--- a/config-model/src/test/derived/imported_struct_fields/parent.sd
+++ b/config-model/src/test/derived/imported_struct_fields/parent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent {
+schema parent {
   document parent {
     struct elem {
       field name type string {}
diff --git a/config-model/src/test/derived/importedfields/child.sd b/config-model/src/test/derived/importedfields/child.sd
index dc512471022..627e494b385 100644
--- a/config-model/src/test/derived/importedfields/child.sd
+++ b/config-model/src/test/derived/importedfields/child.sd
@@ -1,9 +1,15 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
   document child {
-    field a_ref type reference<parent_a> { indexing: attribute }
-    field b_ref type reference<parent_b> { indexing: attribute }
-    field b_ref_with_summary type reference<parent_b> { indexing: attribute | summary }
+    field a_ref type reference<parent_a> {
+        indexing: attribute
+    }
+    field b_ref type reference<parent_b> {
+        indexing: attribute
+    }
+    field b_ref_with_summary type reference<parent_b> {
+        indexing: attribute | summary
+    }
   }
   import field a_ref.int_field as my_int_field {}
   import field b_ref.string_field as my_string_field {}
diff --git a/config-model/src/test/derived/importedfields/grandparent.sd b/config-model/src/test/derived/importedfields/grandparent.sd
index 7ec4c5f911b..b6902018547 100644
--- a/config-model/src/test/derived/importedfields/grandparent.sd
+++ b/config-model/src/test/derived/importedfields/grandparent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search grandparent {
+schema grandparent {
   document grandparent {
     field int_field type int {
       indexing: attribute
diff --git a/config-model/src/test/derived/importedfields/parent_a.sd b/config-model/src/test/derived/importedfields/parent_a.sd
index 85055606539..c3ff0dd249e 100644
--- a/config-model/src/test/derived/importedfields/parent_a.sd
+++ b/config-model/src/test/derived/importedfields/parent_a.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent_a {
+schema parent_a {
   document parent_a {
     field grandparent_ref type reference<grandparent> {
       indexing: attribute
diff --git a/config-model/src/test/derived/importedfields/parent_b.sd b/config-model/src/test/derived/importedfields/parent_b.sd
index f5ed8c5ffae..b8662070da3 100644
--- a/config-model/src/test/derived/importedfields/parent_b.sd
+++ b/config-model/src/test/derived/importedfields/parent_b.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent_b {
+schema parent_b {
   document parent_b {
     field string_field type string {
       indexing: attribute
diff --git a/config-model/src/test/derived/indexinfo_fieldsets/indexinfo_fieldsets.sd b/config-model/src/test/derived/indexinfo_fieldsets/indexinfo_fieldsets.sd
index 885def07950..58b37f7fdd3 100644
--- a/config-model/src/test/derived/indexinfo_fieldsets/indexinfo_fieldsets.sd
+++ b/config-model/src/test/derived/indexinfo_fieldsets/indexinfo_fieldsets.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search indexinfo_fieldsets {
+schema indexinfo_fieldsets {
 
   document indexinfo_fieldsets {
 
diff --git a/config-model/src/test/derived/indexinfo_lowercase/indexinfo_lowercase.sd b/config-model/src/test/derived/indexinfo_lowercase/indexinfo_lowercase.sd
index c4de1fa1a91..b42672c21aa 100644
--- a/config-model/src/test/derived/indexinfo_lowercase/indexinfo_lowercase.sd
+++ b/config-model/src/test/derived/indexinfo_lowercase/indexinfo_lowercase.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search indexinfo_lowercase {
+schema indexinfo_lowercase {
 
     document indexinfo_lowercase {
         field lc_attribute_src type string {
diff --git a/config-model/src/test/derived/indexschema/indexschema.sd b/config-model/src/test/derived/indexschema/indexschema.sd
index 2e6b5ae2933..47dd8aa79be 100644
--- a/config-model/src/test/derived/indexschema/indexschema.sd
+++ b/config-model/src/test/derived/indexschema/indexschema.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search indexschema {
+schema indexschema {
 
   field searchfield1 type string {}
   field searchfield2 type int {}
diff --git a/config-model/src/test/derived/indexswitches/indexswitches.sd b/config-model/src/test/derived/indexswitches/indexswitches.sd
index 8ed161f11f7..34d1d159417 100644
--- a/config-model/src/test/derived/indexswitches/indexswitches.sd
+++ b/config-model/src/test/derived/indexswitches/indexswitches.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search indexswitches {
+schema indexswitches {
 
   document indexswitches {
 
diff --git a/config-model/src/test/derived/inheritance/child.sd b/config-model/src/test/derived/inheritance/child.sd
index 76876d68374..315c77b1b60 100644
--- a/config-model/src/test/derived/inheritance/child.sd
+++ b/config-model/src/test/derived/inheritance/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
 
   document child inherits father, mother {
     
diff --git a/config-model/src/test/derived/inheritdiamond/child.sd b/config-model/src/test/derived/inheritdiamond/child.sd
index ba3c6fdd744..8fa64ad745d 100644
--- a/config-model/src/test/derived/inheritdiamond/child.sd
+++ b/config-model/src/test/derived/inheritdiamond/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
     document child inherits mother, father {
         struct child_struct {
             field child_field type string { }
diff --git a/config-model/src/test/derived/inheritdiamond/father.sd b/config-model/src/test/derived/inheritdiamond/father.sd
index df628f9e4ef..361dbc3253a 100644
--- a/config-model/src/test/derived/inheritdiamond/father.sd
+++ b/config-model/src/test/derived/inheritdiamond/father.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search father {
+schema father {
     document father inherits grandparent {
         struct father_struct {
             field father_field type string { }
diff --git a/config-model/src/test/derived/inheritdiamond/grandparent.sd b/config-model/src/test/derived/inheritdiamond/grandparent.sd
index 6b19dd129ef..0ad69f52cfe 100644
--- a/config-model/src/test/derived/inheritdiamond/grandparent.sd
+++ b/config-model/src/test/derived/inheritdiamond/grandparent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search grandparent {
+schema grandparent {
     document grandparent {
         struct grandparent_struct {
             field grandparent_field type string { }
diff --git a/config-model/src/test/derived/inheritdiamond/mother.sd b/config-model/src/test/derived/inheritdiamond/mother.sd
index e7b6b6143e6..0f4b5ca9d3b 100644
--- a/config-model/src/test/derived/inheritdiamond/mother.sd
+++ b/config-model/src/test/derived/inheritdiamond/mother.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search mother {
+schema mother {
     document mother inherits grandparent {
         struct mother_struct {
             field mother_field type string { }
diff --git a/config-model/src/test/derived/inheritfromgrandparent/child.sd b/config-model/src/test/derived/inheritfromgrandparent/child.sd
index 8678cbad3e1..b6859e84442 100644
--- a/config-model/src/test/derived/inheritfromgrandparent/child.sd
+++ b/config-model/src/test/derived/inheritfromgrandparent/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
     document child inherits parent {
         field child_field type grandparent_struct { }
     }
diff --git a/config-model/src/test/derived/inheritfromgrandparent/grandparent.sd b/config-model/src/test/derived/inheritfromgrandparent/grandparent.sd
index 6b19dd129ef..0ad69f52cfe 100644
--- a/config-model/src/test/derived/inheritfromgrandparent/grandparent.sd
+++ b/config-model/src/test/derived/inheritfromgrandparent/grandparent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search grandparent {
+schema grandparent {
     document grandparent {
         struct grandparent_struct {
             field grandparent_field type string { }
diff --git a/config-model/src/test/derived/inheritfromgrandparent/parent.sd b/config-model/src/test/derived/inheritfromgrandparent/parent.sd
index 6857f786efe..963e44799d9 100644
--- a/config-model/src/test/derived/inheritfromgrandparent/parent.sd
+++ b/config-model/src/test/derived/inheritfromgrandparent/parent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent {
+schema parent {
     document parent inherits grandparent {
 
     }
diff --git a/config-model/src/test/derived/inheritfromnull/inheritfromnull.sd b/config-model/src/test/derived/inheritfromnull/inheritfromnull.sd
index 769a0c74aa2..549284e79b6 100644
--- a/config-model/src/test/derived/inheritfromnull/inheritfromnull.sd
+++ b/config-model/src/test/derived/inheritfromnull/inheritfromnull.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search inheritfromnull {
+schema inheritfromnull {
     document inheritfromnull inherits foo {
     }  
 }
diff --git a/config-model/src/test/derived/inheritfromparent/child.sd b/config-model/src/test/derived/inheritfromparent/child.sd
index ea577d620b7..055f998b8f0 100644
--- a/config-model/src/test/derived/inheritfromparent/child.sd
+++ b/config-model/src/test/derived/inheritfromparent/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
     document child inherits parent {
         field child_field type parent_struct { }
     }
diff --git a/config-model/src/test/derived/inheritfromparent/parent.sd b/config-model/src/test/derived/inheritfromparent/parent.sd
index 502da7efcaf..ceda280ec30 100644
--- a/config-model/src/test/derived/inheritfromparent/parent.sd
+++ b/config-model/src/test/derived/inheritfromparent/parent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent {
+schema parent {
     document parent {
         struct parent_struct {
             field parent_field type string { }
diff --git a/config-model/src/test/derived/inheritstruct/child.sd b/config-model/src/test/derived/inheritstruct/child.sd
index fcc3cececc3..00cc09e9d2f 100644
--- a/config-model/src/test/derived/inheritstruct/child.sd
+++ b/config-model/src/test/derived/inheritstruct/child.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search child {
+schema child {
     document child inherits parent {
       struct other_struct inherits my_struct {
         field my_int type int {}
diff --git a/config-model/src/test/derived/inheritstruct/parent.sd b/config-model/src/test/derived/inheritstruct/parent.sd
index c5bf71a8479..2ea8ad0ce7c 100644
--- a/config-model/src/test/derived/inheritstruct/parent.sd
+++ b/config-model/src/test/derived/inheritstruct/parent.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search parent {
+schema parent {
     document parent {
         struct my_struct {
             field my_str type string { }
diff --git a/config-model/src/test/derived/integerattributetostringindex/integerattributetostringindex.sd b/config-model/src/test/derived/integerattributetostringindex/integerattributetostringindex.sd
index a394b0d0094..7678093c28c 100644
--- a/config-model/src/test/derived/integerattributetostringindex/integerattributetostringindex.sd
+++ b/config-model/src/test/derived/integerattributetostringindex/integerattributetostringindex.sd
@@ -1,25 +1,21 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search integerattributetostringindex {
+schema integerattributetostringindex {
   document integerattributetostringindex {
   field attinx type int {
   indexing: summary |  attribute | index
-  # index-to: attinx,default
   }
 
 field artist type string {
 indexing: summary | attribute
-# index-to: artist, default
 }
 
 
 field title type string {
 indexing: summary | index
-# index-to: title, default
 }
 
 field year type int {
 indexing: summary | attribute
-# index-to:default
 attribute : fast-search
 }
 
diff --git a/config-model/src/test/derived/mail/mail.sd b/config-model/src/test/derived/mail/mail.sd
index 73108fa280e..848b67e1b1f 100644
--- a/config-model/src/test/derived/mail/mail.sd
+++ b/config-model/src/test/derived/mail/mail.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search mail {
+schema mail {
 
   stemming: none
 
diff --git a/config-model/src/test/derived/map_attribute/test.sd b/config-model/src/test/derived/map_attribute/test.sd
index 63fa3ba691f..5ba429a5f47 100644
--- a/config-model/src/test/derived/map_attribute/test.sd
+++ b/config-model/src/test/derived/map_attribute/test.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
+schema test {
   document test {
     field str_map type map<string, string> {
       indexing: summary 
diff --git a/config-model/src/test/derived/map_of_struct_attribute/test.sd b/config-model/src/test/derived/map_of_struct_attribute/test.sd
index ed81610467e..7806d49392e 100644
--- a/config-model/src/test/derived/map_of_struct_attribute/test.sd
+++ b/config-model/src/test/derived/map_of_struct_attribute/test.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
+schema test {
   document test {
     struct elem {
       field name type string {}
diff --git a/config-model/src/test/derived/matchsettings_map_after/test.sd b/config-model/src/test/derived/matchsettings_map_after/test.sd
index 2f6372628c9..fe575e81c69 100644
--- a/config-model/src/test/derived/matchsettings_map_after/test.sd
+++ b/config-model/src/test/derived/matchsettings_map_after/test.sd
@@ -1,7 +1,7 @@
 
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search test {
+schema test {
   document test {
 
     field mse4 type map<string,elem> {
diff --git a/config-model/src/test/derived/matchsettings_map_def/test.sd b/config-model/src/test/derived/matchsettings_map_def/test.sd
index 7f2517c80fc..1a48cce0f45 100644
--- a/config-model/src/test/derived/matchsettings_map_def/test.sd
+++ b/config-model/src/test/derived/matchsettings_map_def/test.sd
@@ -1,7 +1,7 @@
 
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search test {
+schema test {
   document test {
 
     struct elem {
diff --git a/config-model/src/test/derived/matchsettings_map_in_struct/test.sd b/config-model/src/test/derived/matchsettings_map_in_struct/test.sd
index 6e1b87362cc..f11bb397fbc 100644
--- a/config-model/src/test/derived/matchsettings_map_in_struct/test.sd
+++ b/config-model/src/test/derived/matchsettings_map_in_struct/test.sd
@@ -1,7 +1,7 @@
 
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search test {
+schema test {
   document test {
 
     struct elem {
diff --git a/config-model/src/test/derived/matchsettings_map_wfs/test.sd b/config-model/src/test/derived/matchsettings_map_wfs/test.sd
index 12c0c395282..7747378376c 100644
--- a/config-model/src/test/derived/matchsettings_map_wfs/test.sd
+++ b/config-model/src/test/derived/matchsettings_map_wfs/test.sd
@@ -1,7 +1,7 @@
 
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search test {
+schema test {
   document test {
 
     struct elem {
diff --git a/config-model/src/test/derived/matchsettings_map_wss/test.sd b/config-model/src/test/derived/matchsettings_map_wss/test.sd
index 58162ea93fc..f27d7d7a915 100644
--- a/config-model/src/test/derived/matchsettings_map_wss/test.sd
+++ b/config-model/src/test/derived/matchsettings_map_wss/test.sd
@@ -1,7 +1,7 @@
 
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search test {
+schema test {
   document test {
 
     struct elem {
diff --git a/config-model/src/test/derived/matchsettings_simple_def/test.sd b/config-model/src/test/derived/matchsettings_simple_def/test.sd
index 8d5a1733a44..c1f9cbd4282 100644
--- a/config-model/src/test/derived/matchsettings_simple_def/test.sd
+++ b/config-model/src/test/derived/matchsettings_simple_def/test.sd
@@ -1,7 +1,6 @@
-
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search test {
+schema test {
   document test {
 
     struct elem {
diff --git a/config-model/src/test/derived/matchsettings_simple_wfs/test.sd b/config-model/src/test/derived/matchsettings_simple_wfs/test.sd
index 9c709d8167e..5428b006f49 100644
--- a/config-model/src/test/derived/matchsettings_simple_wfs/test.sd
+++ b/config-model/src/test/derived/matchsettings_simple_wfs/test.sd
@@ -1,7 +1,6 @@
-
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search test {
+schema test {
   document test {
 
     struct elem {
diff --git a/config-model/src/test/derived/matchsettings_simple_wss/test.sd b/config-model/src/test/derived/matchsettings_simple_wss/test.sd
index 451d9ad06d8..e91d36e24ad 100644
--- a/config-model/src/test/derived/matchsettings_simple_wss/test.sd
+++ b/config-model/src/test/derived/matchsettings_simple_wss/test.sd
@@ -1,7 +1,6 @@
-
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search test {
+schema test {
   document test {
 
     struct elem {
diff --git a/config-model/src/test/derived/matchsettings_simple_wss_wfs/test.sd b/config-model/src/test/derived/matchsettings_simple_wss_wfs/test.sd
index f3967e6ad80..cf7d793b47c 100644
--- a/config-model/src/test/derived/matchsettings_simple_wss_wfs/test.sd
+++ b/config-model/src/test/derived/matchsettings_simple_wss_wfs/test.sd
@@ -1,7 +1,6 @@
-
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search test {
+schema test {
   document test {
 
     struct elem {
diff --git a/config-model/src/test/derived/mlr/mlr.sd b/config-model/src/test/derived/mlr/mlr.sd
index 66fa24a8417..c0ad502a35c 100644
--- a/config-model/src/test/derived/mlr/mlr.sd
+++ b/config-model/src/test/derived/mlr/mlr.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search mlr {
+schema mlr {
 
   document mlr {
 
diff --git a/config-model/src/test/derived/multi_struct/ad.sd b/config-model/src/test/derived/multi_struct/ad.sd
index a14cd6dc023..ee389e510b4 100644
--- a/config-model/src/test/derived/multi_struct/ad.sd
+++ b/config-model/src/test/derived/multi_struct/ad.sd
@@ -1,4 +1,4 @@
-search ad {
+schema ad {
     document ad {
         field e type string {
             indexing: attribute | summary
diff --git a/config-model/src/test/derived/multi_struct/product.sd b/config-model/src/test/derived/multi_struct/product.sd
index cba611cd794..d1c63614917 100644
--- a/config-model/src/test/derived/multi_struct/product.sd
+++ b/config-model/src/test/derived/multi_struct/product.sd
@@ -1,4 +1,4 @@
-search product {
+schema product {
   document product {
     struct mystruct {
         field zero type string {}
diff --git a/config-model/src/test/derived/multi_struct/shop.sd b/config-model/src/test/derived/multi_struct/shop.sd
index b5c06cc493f..7b96bbed471 100644
--- a/config-model/src/test/derived/multi_struct/shop.sd
+++ b/config-model/src/test/derived/multi_struct/shop.sd
@@ -1,4 +1,4 @@
-search shop {
+schema shop {
     document shop {
         struct mystruct {
             field one type string {}
diff --git a/config-model/src/test/derived/multi_struct/user.sd b/config-model/src/test/derived/multi_struct/user.sd
index ec23e9f88ea..798171f062f 100644
--- a/config-model/src/test/derived/multi_struct/user.sd
+++ b/config-model/src/test/derived/multi_struct/user.sd
@@ -1,4 +1,4 @@
-search user {
+schema user {
     document user {
         field a type string {
           indexing: summary
diff --git a/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd b/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd
index ae0e2fe92bc..51259802a3a 100644
--- a/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd
+++ b/config-model/src/test/derived/multiplesummaries/multiplesummaries.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search multiplesummaries {
+schema multiplesummaries {
 
   document multiplesummaries {
 
diff --git a/config-model/src/test/derived/music/music.sd b/config-model/src/test/derived/music/music.sd
index 87479804f84..919e324c4bc 100644
--- a/config-model/src/test/derived/music/music.sd
+++ b/config-model/src/test/derived/music/music.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search music {
+schema music {
   
   document music {
 
diff --git a/config-model/src/test/derived/music3/music3.sd b/config-model/src/test/derived/music3/music3.sd
index aac756d29b0..7123c45bac2 100644
--- a/config-model/src/test/derived/music3/music3.sd
+++ b/config-model/src/test/derived/music3/music3.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search music3 {
+schema music3 {
 
   document music3 {
 
diff --git a/config-model/src/test/derived/namecollision/collision.sd b/config-model/src/test/derived/namecollision/collision.sd
index 56c1be2aada..509a1464090 100644
--- a/config-model/src/test/derived/namecollision/collision.sd
+++ b/config-model/src/test/derived/namecollision/collision.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search collision {
+schema collision {
 
   document collision {
 
diff --git a/config-model/src/test/derived/namecollision/collisionstruct.sd b/config-model/src/test/derived/namecollision/collisionstruct.sd
index 5a9d1fe2f11..2416e592513 100644
--- a/config-model/src/test/derived/namecollision/collisionstruct.sd
+++ b/config-model/src/test/derived/namecollision/collisionstruct.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search collisionstruct {
+schema collisionstruct {
 
     document collisionstruct {
 
diff --git a/config-model/src/test/derived/nearestneighbor/test.sd b/config-model/src/test/derived/nearestneighbor/test.sd
index 58790d283ee..9c47f89bfd9 100644
--- a/config-model/src/test/derived/nearestneighbor/test.sd
+++ b/config-model/src/test/derived/nearestneighbor/test.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
+schema test {
   document test {
     field id type int {
       indexing: attribute | summary
diff --git a/config-model/src/test/derived/neuralnet/neuralnet.sd b/config-model/src/test/derived/neuralnet/neuralnet.sd
index b67081e71a7..54f6cefc6f4 100644
--- a/config-model/src/test/derived/neuralnet/neuralnet.sd
+++ b/config-model/src/test/derived/neuralnet/neuralnet.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search neuralnet {
+schema neuralnet {
 
     document neuralnet {