summaryrefslogtreecommitdiffstats
path: root/config-model/src/test/cfg/application
diff options
context:
space:
mode:
Diffstat (limited to 'config-model/src/test/cfg/application')
-rw-r--r--config-model/src/test/cfg/application/app1/deployment.xml2
-rw-r--r--config-model/src/test/cfg/application/app1/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/app1/schemas/laptop.sd2
-rw-r--r--config-model/src/test/cfg/application/app1/schemas/music.sd2
-rw-r--r--config-model/src/test/cfg/application/app1/schemas/pc.sd2
-rw-r--r--config-model/src/test/cfg/application/app1/schemas/product.sd2
-rw-r--r--config-model/src/test/cfg/application/app1/schemas/sock.sd2
-rw-r--r--config-model/src/test/cfg/application/app1/services.xml2
-rw-r--r--config-model/src/test/cfg/application/app_complicated_deployment_spec/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd2
-rw-r--r--config-model/src/test/cfg/application/app_complicated_deployment_spec/services.xml2
-rw-r--r--config-model/src/test/cfg/application/app_genericservices/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/app_genericservices/schemas/music.sd2
-rw-r--r--config-model/src/test/cfg/application/app_genericservices/services.xml2
-rw-r--r--config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml2
-rw-r--r--config-model/src/test/cfg/application/app_invalid_deployment_xml/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/app_invalid_deployment_xml/services.xml2
-rw-r--r--config-model/src/test/cfg/application/app_nohosts/schemas/mail.sd2
-rw-r--r--config-model/src/test/cfg/application/app_nohosts/schemas/mailbox.sd2
-rw-r--r--config-model/src/test/cfg/application/app_nohosts/schemas/message.sd2
-rw-r--r--config-model/src/test/cfg/application/app_nohosts/services.xml2
-rw-r--r--config-model/src/test/cfg/application/app_permanent/permanent-services.xml2
-rw-r--r--config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd2
-rw-r--r--config-model/src/test/cfg/application/app_qrserverandgw/services.xml2
-rw-r--r--config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def2
-rw-r--r--config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def2
-rw-r--r--config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def2
-rw-r--r--config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def2
-rw-r--r--config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def2
-rw-r--r--config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def2
-rw-r--r--config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def2
-rw-r--r--config-model/src/test/cfg/application/configuredportconfig/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/configuredportconfig/services.xml2
-rw-r--r--config-model/src/test/cfg/application/custompropconfig/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/custompropconfig/services.xml2
-rw-r--r--config-model/src/test/cfg/application/deprecated_features_app/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd2
-rw-r--r--config-model/src/test/cfg/application/deprecated_features_app/services.xml2
-rw-r--r--config-model/src/test/cfg/application/doubleconfig/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/doubleconfig/services.xml2
-rw-r--r--config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/deployment.xml2
-rw-r--r--config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/services.xml2
-rw-r--r--config-model/src/test/cfg/application/include_dirs/dir1/default.xml2
-rw-r--r--config-model/src/test/cfg/application/include_dirs/dir2/chain2.xml2
-rw-r--r--config-model/src/test/cfg/application/include_dirs/dir2/chain3.xml2
-rw-r--r--config-model/src/test/cfg/application/include_dirs/jdisc_dir/jdisc1.xml2
-rw-r--r--config-model/src/test/cfg/application/include_dirs/services.xml2
-rw-r--r--config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml2
-rw-r--r--config-model/src/test/cfg/application/invalid_parallel_deployment_xml/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/invalid_parallel_deployment_xml/services.xml2
-rw-r--r--config-model/src/test/cfg/application/metricsconfig/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/metricsconfig/services.xml2
-rw-r--r--config-model/src/test/cfg/application/ml_models/schemas/test.sd2
-rw-r--r--config-model/src/test/cfg/application/ml_models/services.xml2
-rw-r--r--config-model/src/test/cfg/application/ml_serving/models/sqrt.py2
-rw-r--r--config-model/src/test/cfg/application/ml_serving/services.xml2
-rw-r--r--config-model/src/test/cfg/application/ml_serving_not_activated/services.xml2
-rw-r--r--config-model/src/test/cfg/application/newfilenames/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/newfilenames/services.xml2
-rwxr-xr-xconfig-model/src/test/cfg/application/onnx/files/add.py2
-rwxr-xr-xconfig-model/src/test/cfg/application/onnx/models/mul.py2
-rw-r--r--config-model/src/test/cfg/application/onnx/schemas/test.sd2
-rw-r--r--config-model/src/test/cfg/application/onnx/services.xml2
-rwxr-xr-xconfig-model/src/test/cfg/application/onnx_name_collision/models/barfoo.py2
-rwxr-xr-xconfig-model/src/test/cfg/application/onnx_name_collision/models/foobar.py2
-rw-r--r--config-model/src/test/cfg/application/onnx_name_collision/services.xml2
-rw-r--r--config-model/src/test/cfg/application/plugins/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/plugins/services.xml2
-rw-r--r--config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd2
-rw-r--r--config-model/src/test/cfg/application/sdfilenametest/services.xml2
-rw-r--r--config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def2
-rw-r--r--config-model/src/test/cfg/application/simpleconfig/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/simpleconfig/services.xml2
-rwxr-xr-xconfig-model/src/test/cfg/application/stateless_eval/mul.py2
-rw-r--r--config-model/src/test/cfg/application/treeconfig/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/treeconfig/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/document_references_validation/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/document_references_validation/schemas/ad.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/document_references_validation/schemas/campaign.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/document_references_validation/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/global_distribution_validation/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/parent.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/global_distribution_validation/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/index_struct/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/index_struct/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/prefix/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/prefix/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/prefix_index/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/prefix_index/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/prefix_index_and_attribute/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/prefix_index_and_attribute/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/prefix_streaming/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/prefix_streaming/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/ranking_constants_fail/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/ranking_constants_ok/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/ranking_constants_ok/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/search_alltypes/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/search_alltypes/schemas/parent.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/search_alltypes/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/search_alltypes/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/search_empty_content/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/search_empty_content/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/search_empty_content/services.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/search_struct/hosts.xml2
-rw-r--r--config-model/src/test/cfg/application/validation/search_struct/schemas/simple.sd2
-rw-r--r--config-model/src/test/cfg/application/validation/search_struct/services.xml2
110 files changed, 110 insertions, 110 deletions
diff --git a/config-model/src/test/cfg/application/app1/deployment.xml b/config-model/src/test/cfg/application/app1/deployment.xml
index ea255b207f3..a8771123ecc 100644
--- a/config-model/src/test/cfg/application/app1/deployment.xml
+++ b/config-model/src/test/cfg/application/app1/deployment.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<deployment version="1.0">
<test/>
<staging/>
diff --git a/config-model/src/test/cfg/application/app1/hosts.xml b/config-model/src/test/cfg/application/app1/hosts.xml
index 9cbdd000786..b7ff748cbdc 100644
--- a/config-model/src/test/cfg/application/app1/hosts.xml
+++ b/config-model/src/test/cfg/application/app1/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/app1/schemas/laptop.sd b/config-model/src/test/cfg/application/app1/schemas/laptop.sd
index 21a76ad605c..f4f3f0a3fa1 100644
--- a/config-model/src/test/cfg/application/app1/schemas/laptop.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/laptop.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search laptop {
document laptop inherits product {
diff --git a/config-model/src/test/cfg/application/app1/schemas/music.sd b/config-model/src/test/cfg/application/app1/schemas/music.sd
index 693afbd308d..92e87848a8a 100644
--- a/config-model/src/test/cfg/application/app1/schemas/music.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/music.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
# A basic search definition - called music, should be saved to music.sd
search music {
diff --git a/config-model/src/test/cfg/application/app1/schemas/pc.sd b/config-model/src/test/cfg/application/app1/schemas/pc.sd
index bdc90328cdb..bc83d2423f3 100644
--- a/config-model/src/test/cfg/application/app1/schemas/pc.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/pc.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search pc {
document pc inherits product {
diff --git a/config-model/src/test/cfg/application/app1/schemas/product.sd b/config-model/src/test/cfg/application/app1/schemas/product.sd
index 588a1d544c6..132ae15053f 100644
--- a/config-model/src/test/cfg/application/app1/schemas/product.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/product.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
document product {
field title type string {
diff --git a/config-model/src/test/cfg/application/app1/schemas/sock.sd b/config-model/src/test/cfg/application/app1/schemas/sock.sd
index 9331c0caf54..f62ddba9c0a 100644
--- a/config-model/src/test/cfg/application/app1/schemas/sock.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/sock.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search sock {
document sock inherits product {
diff --git a/config-model/src/test/cfg/application/app1/services.xml b/config-model/src/test/cfg/application/app1/services.xml
index 6b59d13844a..d873129b2c7 100644
--- a/config-model/src/test/cfg/application/app1/services.xml
+++ b/config-model/src/test/cfg/application/app1/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<admin version="2.0">
diff --git a/config-model/src/test/cfg/application/app_complicated_deployment_spec/hosts.xml b/config-model/src/test/cfg/application/app_complicated_deployment_spec/hosts.xml
index a7fc725d377..62621bdbc95 100644
--- a/config-model/src/test/cfg/application/app_complicated_deployment_spec/hosts.xml
+++ b/config-model/src/test/cfg/application/app_complicated_deployment_spec/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="bogusname1">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd b/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd
index 693afbd308d..92e87848a8a 100644
--- a/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd
+++ b/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
# A basic search definition - called music, should be saved to music.sd
search music {
diff --git a/config-model/src/test/cfg/application/app_complicated_deployment_spec/services.xml b/config-model/src/test/cfg/application/app_complicated_deployment_spec/services.xml
index 9ae7f122e81..02d41eac283 100644
--- a/config-model/src/test/cfg/application/app_complicated_deployment_spec/services.xml
+++ b/config-model/src/test/cfg/application/app_complicated_deployment_spec/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<service version="1.0" name="myservice" command="mycmd1.sh">
diff --git a/config-model/src/test/cfg/application/app_genericservices/hosts.xml b/config-model/src/test/cfg/application/app_genericservices/hosts.xml
index a7fc725d377..62621bdbc95 100644
--- a/config-model/src/test/cfg/application/app_genericservices/hosts.xml
+++ b/config-model/src/test/cfg/application/app_genericservices/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="bogusname1">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd b/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd
index 693afbd308d..92e87848a8a 100644
--- a/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd
+++ b/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
# A basic search definition - called music, should be saved to music.sd
search music {
diff --git a/config-model/src/test/cfg/application/app_genericservices/services.xml b/config-model/src/test/cfg/application/app_genericservices/services.xml
index 9ae7f122e81..02d41eac283 100644
--- a/config-model/src/test/cfg/application/app_genericservices/services.xml
+++ b/config-model/src/test/cfg/application/app_genericservices/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<service version="1.0" name="myservice" command="mycmd1.sh">
diff --git a/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml
index 489e7e56628..ac72067e9e7 100644
--- a/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml
+++ b/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<deployment version="1.0">
<test/>
<staging/>
diff --git a/config-model/src/test/cfg/application/app_invalid_deployment_xml/hosts.xml b/config-model/src/test/cfg/application/app_invalid_deployment_xml/hosts.xml
index 115efd488d0..e2098c97d1e 100644
--- a/config-model/src/test/cfg/application/app_invalid_deployment_xml/hosts.xml
+++ b/config-model/src/test/cfg/application/app_invalid_deployment_xml/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/app_invalid_deployment_xml/services.xml b/config-model/src/test/cfg/application/app_invalid_deployment_xml/services.xml
index 03d8fc012ac..511612357f5 100644
--- a/config-model/src/test/cfg/application/app_invalid_deployment_xml/services.xml
+++ b/config-model/src/test/cfg/application/app_invalid_deployment_xml/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<admin version="2.0">
diff --git a/config-model/src/test/cfg/application/app_nohosts/schemas/mail.sd b/config-model/src/test/cfg/application/app_nohosts/schemas/mail.sd
index 8b6a6c44bf1..7bffc2cfb2a 100644
--- a/config-model/src/test/cfg/application/app_nohosts/schemas/mail.sd
+++ b/config-model/src/test/cfg/application/app_nohosts/schemas/mail.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search mail {
document mail {
diff --git a/config-model/src/test/cfg/application/app_nohosts/schemas/mailbox.sd b/config-model/src/test/cfg/application/app_nohosts/schemas/mailbox.sd
index f98017f401e..ad0959a256e 100644
--- a/config-model/src/test/cfg/application/app_nohosts/schemas/mailbox.sd
+++ b/config-model/src/test/cfg/application/app_nohosts/schemas/mailbox.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search mailbox {
document mailbox {
diff --git a/config-model/src/test/cfg/application/app_nohosts/schemas/message.sd b/config-model/src/test/cfg/application/app_nohosts/schemas/message.sd
index 6c27917c656..78a2fcb5d33 100644
--- a/config-model/src/test/cfg/application/app_nohosts/schemas/message.sd
+++ b/config-model/src/test/cfg/application/app_nohosts/schemas/message.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search message {
document message {
diff --git a/config-model/src/test/cfg/application/app_nohosts/services.xml b/config-model/src/test/cfg/application/app_nohosts/services.xml
index 5ce2d8ecd63..d4f5e257fb5 100644
--- a/config-model/src/test/cfg/application/app_nohosts/services.xml
+++ b/config-model/src/test/cfg/application/app_nohosts/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
diff --git a/config-model/src/test/cfg/application/app_permanent/permanent-services.xml b/config-model/src/test/cfg/application/app_permanent/permanent-services.xml
index 2efbc08a68f..bf00993d3e2 100644
--- a/config-model/src/test/cfg/application/app_permanent/permanent-services.xml
+++ b/config-model/src/test/cfg/application/app_permanent/permanent-services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<container version="1.0">
<search />
diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml b/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml
index 3be2fd994d9..3c78eba2e68 100644
--- a/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml
+++ b/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node0</alias>
diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd b/config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd
index c09b2fb2da2..40457c9e636 100644
--- a/config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd
+++ b/config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search message {
document message {
diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/services.xml b/config-model/src/test/cfg/application/app_qrserverandgw/services.xml
index a70c3c152f5..fbcd698035e 100644
--- a/config-model/src/test/cfg/application/app_qrserverandgw/services.xml
+++ b/config-model/src/test/cfg/application/app_qrserverandgw/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
diff --git a/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def b/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def
index c8e51c391f7..f733b6155d3 100644
--- a/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def
+++ b/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=vespa.config.search
attribute[].name string
attribute[].datatype string
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def
index c37aafd6fc4..afda0ecef71 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def
@@ -1,3 +1,3 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=config
bar int default=1
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def
index c37aafd6fc4..afda0ecef71 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def
@@ -1,3 +1,3 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=config
bar int default=1
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def
index 1ff4daea194..31fb619029e 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=qux
bar int default=2
quux int default=3
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def
index e1d5e8341e7..e4893ab672d 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def
@@ -1,3 +1,3 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=xyzzy
bar int default="1"
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def
index c30d4b36ad3..8a936aa44dd 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def
@@ -1,3 +1,3 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=xyzzy
bar int
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def
index d4ef225830a..5e70a2de97a 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=xyzzy
bar int default="2"
foo int
diff --git a/config-model/src/test/cfg/application/configuredportconfig/hosts.xml b/config-model/src/test/cfg/application/configuredportconfig/hosts.xml
index ca6d75d5e7e..2808c977ba0 100644
--- a/config-model/src/test/cfg/application/configuredportconfig/hosts.xml
+++ b/config-model/src/test/cfg/application/configuredportconfig/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>host1</alias>
diff --git a/config-model/src/test/cfg/application/configuredportconfig/services.xml b/config-model/src/test/cfg/application/configuredportconfig/services.xml
index 93d491a8fac..0337cef133c 100644
--- a/config-model/src/test/cfg/application/configuredportconfig/services.xml
+++ b/config-model/src/test/cfg/application/configuredportconfig/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<com.yahoo.vespa.model.test.SimplePlugin version="1.0">
diff --git a/config-model/src/test/cfg/application/custompropconfig/hosts.xml b/config-model/src/test/cfg/application/custompropconfig/hosts.xml
index c329ffc0844..93383eb92ba 100644
--- a/config-model/src/test/cfg/application/custompropconfig/hosts.xml
+++ b/config-model/src/test/cfg/application/custompropconfig/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>host1</alias>
diff --git a/config-model/src/test/cfg/application/custompropconfig/services.xml b/config-model/src/test/cfg/application/custompropconfig/services.xml
index 37ebac8db4b..2dd0de12df4 100644
--- a/config-model/src/test/cfg/application/custompropconfig/services.xml
+++ b/config-model/src/test/cfg/application/custompropconfig/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<com.yahoo.vespa.model.test.SimpleCustomPropPlugin version="1.0">
<simplecustompropservice hostalias="host1" />
diff --git a/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml b/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml
index f0c76482b2f..3c78eba2e68 100644
--- a/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml
+++ b/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node0</alias>
diff --git a/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd b/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd
index c97c860a129..70bda952bf8 100644
--- a/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd
+++ b/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd
@@ -1,4 +1,4 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search message {
document message {
diff --git a/config-model/src/test/cfg/application/deprecated_features_app/services.xml b/config-model/src/test/cfg/application/deprecated_features_app/services.xml
index daf03d0c4c3..2af41ed7bd5 100644
--- a/config-model/src/test/cfg/application/deprecated_features_app/services.xml
+++ b/config-model/src/test/cfg/application/deprecated_features_app/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
diff --git a/config-model/src/test/cfg/application/doubleconfig/hosts.xml b/config-model/src/test/cfg/application/doubleconfig/hosts.xml
index c329ffc0844..93383eb92ba 100644
--- a/config-model/src/test/cfg/application/doubleconfig/hosts.xml
+++ b/config-model/src/test/cfg/application/doubleconfig/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>host1</alias>
diff --git a/config-model/src/test/cfg/application/doubleconfig/services.xml b/config-model/src/test/cfg/application/doubleconfig/services.xml
index 1e70eeb0ad2..89ab4181dcc 100644
--- a/config-model/src/test/cfg/application/doubleconfig/services.xml
+++ b/config-model/src/test/cfg/application/doubleconfig/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<simpleplugin version="1.0">
diff --git a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/deployment.xml
index 11d4eb39676..9976db230bc 100644
--- a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/deployment.xml
+++ b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/deployment.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<deployment version="1.0">
<test/>
<staging/>
diff --git a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/hosts.xml b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/hosts.xml
index 115efd488d0..e2098c97d1e 100644
--- a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/hosts.xml
+++ b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/services.xml b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/services.xml
index 03d8fc012ac..511612357f5 100644
--- a/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/services.xml
+++ b/config-model/src/test/cfg/application/empty_prod_region_in_deployment_xml/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<admin version="2.0">
diff --git a/config-model/src/test/cfg/application/include_dirs/dir1/default.xml b/config-model/src/test/cfg/application/include_dirs/dir1/default.xml
index 57d9b3f650b..f466c724b98 100644
--- a/config-model/src/test/cfg/application/include_dirs/dir1/default.xml
+++ b/config-model/src/test/cfg/application/include_dirs/dir1/default.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<search>
<chain id="default">
<searcher id="com.yahoo.search.example.SimpleSearcher" bundle="mybundle"/>
diff --git a/config-model/src/test/cfg/application/include_dirs/dir2/chain2.xml b/config-model/src/test/cfg/application/include_dirs/dir2/chain2.xml
index c1e8320c5e7..bfd9409aab4 100644
--- a/config-model/src/test/cfg/application/include_dirs/dir2/chain2.xml
+++ b/config-model/src/test/cfg/application/include_dirs/dir2/chain2.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<search>
<searcher class="com.yahoo.search.example.SimpleSearcher" id="s1" bundle="mybundle"/>
<chain id="chain2">
diff --git a/config-model/src/test/cfg/application/include_dirs/dir2/chain3.xml b/config-model/src/test/cfg/application/include_dirs/dir2/chain3.xml
index ba6755a454a..de7b52f2ff6 100644
--- a/config-model/src/test/cfg/application/include_dirs/dir2/chain3.xml
+++ b/config-model/src/test/cfg/application/include_dirs/dir2/chain3.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<search>
<chain id="chain3_1">
<searcher id="com.yahoo.search.example.SimpleSearcher" bundle="mybundle"/>
diff --git a/config-model/src/test/cfg/application/include_dirs/jdisc_dir/jdisc1.xml b/config-model/src/test/cfg/application/include_dirs/jdisc_dir/jdisc1.xml
index 37b6284afdb..21ec5d3c632 100644
--- a/config-model/src/test/cfg/application/include_dirs/jdisc_dir/jdisc1.xml
+++ b/config-model/src/test/cfg/application/include_dirs/jdisc_dir/jdisc1.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<components>
<component id="test.Exampledocproc"/>
</components>
diff --git a/config-model/src/test/cfg/application/include_dirs/services.xml b/config-model/src/test/cfg/application/include_dirs/services.xml
index 4374cc78bb0..da1b23f338a 100644
--- a/config-model/src/test/cfg/application/include_dirs/services.xml
+++ b/config-model/src/test/cfg/application/include_dirs/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<admin version="2.0">
diff --git a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml
index 8e13f0abb53..4eaf7926078 100644
--- a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml
+++ b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml
@@ -1,4 +1,4 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<deployment version="1.0">
<test/>
<staging/>
diff --git a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/hosts.xml b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/hosts.xml
index 115efd488d0..e2098c97d1e 100644
--- a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/hosts.xml
+++ b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/services.xml b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/services.xml
index 03d8fc012ac..511612357f5 100644
--- a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/services.xml
+++ b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<admin version="2.0">
diff --git a/config-model/src/test/cfg/application/metricsconfig/hosts.xml b/config-model/src/test/cfg/application/metricsconfig/hosts.xml
index c329ffc0844..93383eb92ba 100644
--- a/config-model/src/test/cfg/application/metricsconfig/hosts.xml
+++ b/config-model/src/test/cfg/application/metricsconfig/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>host1</alias>
diff --git a/config-model/src/test/cfg/application/metricsconfig/services.xml b/config-model/src/test/cfg/application/metricsconfig/services.xml
index fc3c6e8ce06..4be12a97ef2 100644
--- a/config-model/src/test/cfg/application/metricsconfig/services.xml
+++ b/config-model/src/test/cfg/application/metricsconfig/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<simple version="1.0">
diff --git a/config-model/src/test/cfg/application/ml_models/schemas/test.sd b/config-model/src/test/cfg/application/ml_models/schemas/test.sd
index cc73f2daff5..00109a5441e 100644
--- a/config-model/src/test/cfg/application/ml_models/schemas/test.sd
+++ b/config-model/src/test/cfg/application/ml_models/schemas/test.sd
@@ -1,4 +1,4 @@
-# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search test {
document test {
diff --git a/config-model/src/test/cfg/application/ml_models/services.xml b/config-model/src/test/cfg/application/ml_models/services.xml
index e53e4eaa6ab..917f1322964 100644
--- a/config-model/src/test/cfg/application/ml_models/services.xml
+++ b/config-model/src/test/cfg/application/ml_models/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<container version="1.0">
diff --git a/config-model/src/test/cfg/application/ml_serving/models/sqrt.py b/config-model/src/test/cfg/application/ml_serving/models/sqrt.py
index b7b99b3850c..98e4f3903a3 100644
--- a/config-model/src/test/cfg/application/ml_serving/models/sqrt.py
+++ b/config-model/src/test/cfg/application/ml_serving/models/sqrt.py
@@ -1,4 +1,4 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
import onnx
from onnx import helper, TensorProto
diff --git a/config-model/src/test/cfg/application/ml_serving/services.xml b/config-model/src/test/cfg/application/ml_serving/services.xml
index 41f44e04c99..4446bd75181 100644
--- a/config-model/src/test/cfg/application/ml_serving/services.xml
+++ b/config-model/src/test/cfg/application/ml_serving/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<container version="1.0">
diff --git a/config-model/src/test/cfg/application/ml_serving_not_activated/services.xml b/config-model/src/test/cfg/application/ml_serving_not_activated/services.xml
index 9d8b7a81201..f8384cb8d15 100644
--- a/config-model/src/test/cfg/application/ml_serving_not_activated/services.xml
+++ b/config-model/src/test/cfg/application/ml_serving_not_activated/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<container version="1.0">
diff --git a/config-model/src/test/cfg/application/newfilenames/hosts.xml b/config-model/src/test/cfg/application/newfilenames/hosts.xml
index c329ffc0844..93383eb92ba 100644
--- a/config-model/src/test/cfg/application/newfilenames/hosts.xml
+++ b/config-model/src/test/cfg/application/newfilenames/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>host1</alias>
diff --git a/config-model/src/test/cfg/application/newfilenames/services.xml b/config-model/src/test/cfg/application/newfilenames/services.xml
index 94698535fb9..20521e2aa82 100644
--- a/config-model/src/test/cfg/application/newfilenames/services.xml
+++ b/config-model/src/test/cfg/application/newfilenames/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<simpleplugin version="1.0">
diff --git a/config-model/src/test/cfg/application/onnx/files/add.py b/config-model/src/test/cfg/application/onnx/files/add.py
index 63b7dc87796..55dc4a18971 100755
--- a/config-model/src/test/cfg/application/onnx/files/add.py
+++ b/config-model/src/test/cfg/application/onnx/files/add.py
@@ -1,4 +1,4 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
import onnx
from onnx import helper, TensorProto
diff --git a/config-model/src/test/cfg/application/onnx/models/mul.py b/config-model/src/test/cfg/application/onnx/models/mul.py
index db01561c355..9fcb8612af9 100755
--- a/config-model/src/test/cfg/application/onnx/models/mul.py
+++ b/config-model/src/test/cfg/application/onnx/models/mul.py
@@ -1,4 +1,4 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
import onnx
from onnx import helper, TensorProto
diff --git a/config-model/src/test/cfg/application/onnx/schemas/test.sd b/config-model/src/test/cfg/application/onnx/schemas/test.sd
index d49782ddf39..a9118b41f90 100644
--- a/config-model/src/test/cfg/application/onnx/schemas/test.sd
+++ b/config-model/src/test/cfg/application/onnx/schemas/test.sd
@@ -1,4 +1,4 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search test {
diff --git a/config-model/src/test/cfg/application/onnx/services.xml b/config-model/src/test/cfg/application/onnx/services.xml
index 1cae9250009..cdfecc3df5a 100644
--- a/config-model/src/test/cfg/application/onnx/services.xml
+++ b/config-model/src/test/cfg/application/onnx/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<container version="1.0">
diff --git a/config-model/src/test/cfg/application/onnx_name_collision/models/barfoo.py b/config-model/src/test/cfg/application/onnx_name_collision/models/barfoo.py
index c9bd7851980..a31418b33ab 100755
--- a/config-model/src/test/cfg/application/onnx_name_collision/models/barfoo.py
+++ b/config-model/src/test/cfg/application/onnx_name_collision/models/barfoo.py
@@ -1,4 +1,4 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
import onnx
from onnx import helper, TensorProto
diff --git a/config-model/src/test/cfg/application/onnx_name_collision/models/foobar.py b/config-model/src/test/cfg/application/onnx_name_collision/models/foobar.py
index c3e0667aeaa..caababb78ab 100755
--- a/config-model/src/test/cfg/application/onnx_name_collision/models/foobar.py
+++ b/config-model/src/test/cfg/application/onnx_name_collision/models/foobar.py
@@ -1,4 +1,4 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
import onnx
from onnx import helper, TensorProto
diff --git a/config-model/src/test/cfg/application/onnx_name_collision/services.xml b/config-model/src/test/cfg/application/onnx_name_collision/services.xml
index 51fdf976f7f..74f1cb5281f 100644
--- a/config-model/src/test/cfg/application/onnx_name_collision/services.xml
+++ b/config-model/src/test/cfg/application/onnx_name_collision/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<container version="1.0">
diff --git a/config-model/src/test/cfg/application/plugins/hosts.xml b/config-model/src/test/cfg/application/plugins/hosts.xml
index ca6d75d5e7e..2808c977ba0 100644
--- a/config-model/src/test/cfg/application/plugins/hosts.xml
+++ b/config-model/src/test/cfg/application/plugins/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>host1</alias>
diff --git a/config-model/src/test/cfg/application/plugins/services.xml b/config-model/src/test/cfg/application/plugins/services.xml
index 3fe3b117cbc..9bf954f9756 100644
--- a/config-model/src/test/cfg/application/plugins/services.xml
+++ b/config-model/src/test/cfg/application/plugins/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
diff --git a/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd b/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd
index 77307c04843..19528975587 100644
--- a/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd
+++ b/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search music {
document music {
diff --git a/config-model/src/test/cfg/application/sdfilenametest/services.xml b/config-model/src/test/cfg/application/sdfilenametest/services.xml
index b135bf4fd2c..dabd2fef5d8 100644
--- a/config-model/src/test/cfg/application/sdfilenametest/services.xml
+++ b/config-model/src/test/cfg/application/sdfilenametest/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services version="1.0">
<admin version="2.0">
diff --git a/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def b/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def
index 0bb16fb8079..3154e6e3f7f 100644
--- a/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def
+++ b/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
namespace=vespa.config.search
attribute[].name string
diff --git a/config-model/src/test/cfg/application/simpleconfig/hosts.xml b/config-model/src/test/cfg/application/simpleconfig/hosts.xml
index c329ffc0844..93383eb92ba 100644
--- a/config-model/src/test/cfg/application/simpleconfig/hosts.xml
+++ b/config-model/src/test/cfg/application/simpleconfig/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>host1</alias>
diff --git a/config-model/src/test/cfg/application/simpleconfig/services.xml b/config-model/src/test/cfg/application/simpleconfig/services.xml
index 2716e65d780..5b51827c0a5 100644
--- a/config-model/src/test/cfg/application/simpleconfig/services.xml
+++ b/config-model/src/test/cfg/application/simpleconfig/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<simple version="1.0">
diff --git a/config-model/src/test/cfg/application/stateless_eval/mul.py b/config-model/src/test/cfg/application/stateless_eval/mul.py
index db01561c355..9fcb8612af9 100755
--- a/config-model/src/test/cfg/application/stateless_eval/mul.py
+++ b/config-model/src/test/cfg/application/stateless_eval/mul.py
@@ -1,4 +1,4 @@
-# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
import onnx
from onnx import helper, TensorProto
diff --git a/config-model/src/test/cfg/application/treeconfig/hosts.xml b/config-model/src/test/cfg/application/treeconfig/hosts.xml
index ca6d75d5e7e..2808c977ba0 100644
--- a/config-model/src/test/cfg/application/treeconfig/hosts.xml
+++ b/config-model/src/test/cfg/application/treeconfig/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>host1</alias>
diff --git a/config-model/src/test/cfg/application/treeconfig/services.xml b/config-model/src/test/cfg/application/treeconfig/services.xml
index 720d62be2f0..876810cab62 100644
--- a/config-model/src/test/cfg/application/treeconfig/services.xml
+++ b/config-model/src/test/cfg/application/treeconfig/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<com.yahoo.vespa.model.test.SimplePlugin version="1.0">
diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/hosts.xml b/config-model/src/test/cfg/application/validation/document_references_validation/hosts.xml
index 9eafb2106cb..54e4487ce77 100644
--- a/config-model/src/test/cfg/application/validation/document_references_validation/hosts.xml
+++ b/config-model/src/test/cfg/application/validation/document_references_validation/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/schemas/ad.sd b/config-model/src/test/cfg/application/validation/document_references_validation/schemas/ad.sd
index 1e85ab70357..e4a9aa60861 100644
--- a/config-model/src/test/cfg/application/validation/document_references_validation/schemas/ad.sd
+++ b/config-model/src/test/cfg/application/validation/document_references_validation/schemas/ad.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search ad {
document ad {
field campaign_ref type reference<campaign> {
diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/schemas/campaign.sd b/config-model/src/test/cfg/application/validation/document_references_validation/schemas/campaign.sd
index 9e208e397b9..7446a6c099c 100644
--- a/config-model/src/test/cfg/application/validation/document_references_validation/schemas/campaign.sd
+++ b/config-model/src/test/cfg/application/validation/document_references_validation/schemas/campaign.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search campaign {
document campaign {
field budget type int {
diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/services.xml b/config-model/src/test/cfg/application/validation/document_references_validation/services.xml
index 3f1c0083c4a..ad0a67921bc 100644
--- a/config-model/src/test/cfg/application/validation/document_references_validation/services.xml
+++ b/config-model/src/test/cfg/application/validation/document_references_validation/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/hosts.xml b/config-model/src/test/cfg/application/validation/global_distribution_validation/hosts.xml
index 9eafb2106cb..54e4487ce77 100644
--- a/config-model/src/test/cfg/application/validation/global_distribution_validation/hosts.xml
+++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/parent.sd b/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/parent.sd
index 8decebc6680..a3dfa6074f5 100644
--- a/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/parent.sd
+++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/parent.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search parent {
document parent {
}
diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/simple.sd b/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/simple.sd
index b901fa6e82a..6f978a27c64 100644
--- a/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {
field my_reference type reference<parent> { indexing: summary | attribute }
diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/services.xml b/config-model/src/test/cfg/application/validation/global_distribution_validation/services.xml
index 0364b68c00e..dcb910df6b5 100644
--- a/config-model/src/test/cfg/application/validation/global_distribution_validation/services.xml
+++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/index_struct/schemas/simple.sd b/config-model/src/test/cfg/application/validation/index_struct/schemas/simple.sd
index a27a2d074d2..674fc6496cc 100644
--- a/config-model/src/test/cfg/application/validation/index_struct/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/index_struct/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {
field foo type map<string, string> { }
diff --git a/config-model/src/test/cfg/application/validation/index_struct/services.xml b/config-model/src/test/cfg/application/validation/index_struct/services.xml
index 9db7ea324bf..d843cc2c365 100644
--- a/config-model/src/test/cfg/application/validation/index_struct/services.xml
+++ b/config-model/src/test/cfg/application/validation/index_struct/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/prefix/schemas/simple.sd b/config-model/src/test/cfg/application/validation/prefix/schemas/simple.sd
index 60ce940fd7d..c75ba72bac5 100644
--- a/config-model/src/test/cfg/application/validation/prefix/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/prefix/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {
field artist type string {
diff --git a/config-model/src/test/cfg/application/validation/prefix/services.xml b/config-model/src/test/cfg/application/validation/prefix/services.xml
index 0764af6df23..03381b1e14b 100644
--- a/config-model/src/test/cfg/application/validation/prefix/services.xml
+++ b/config-model/src/test/cfg/application/validation/prefix/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/prefix_index/schemas/simple.sd b/config-model/src/test/cfg/application/validation/prefix_index/schemas/simple.sd
index bf70a1662c6..5009a2e10df 100644
--- a/config-model/src/test/cfg/application/validation/prefix_index/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/prefix_index/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {
field artist type string {
diff --git a/config-model/src/test/cfg/application/validation/prefix_index/services.xml b/config-model/src/test/cfg/application/validation/prefix_index/services.xml
index 0764af6df23..03381b1e14b 100644
--- a/config-model/src/test/cfg/application/validation/prefix_index/services.xml
+++ b/config-model/src/test/cfg/application/validation/prefix_index/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/schemas/simple.sd b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/schemas/simple.sd
index 41412f4ef4f..50a8c8d1601 100644
--- a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {
field artist type string {
diff --git a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/services.xml b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/services.xml
index 0764af6df23..03381b1e14b 100644
--- a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/services.xml
+++ b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/prefix_streaming/schemas/simple.sd b/config-model/src/test/cfg/application/validation/prefix_streaming/schemas/simple.sd
index bf70a1662c6..5009a2e10df 100644
--- a/config-model/src/test/cfg/application/validation/prefix_streaming/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/prefix_streaming/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {
field artist type string {
diff --git a/config-model/src/test/cfg/application/validation/prefix_streaming/services.xml b/config-model/src/test/cfg/application/validation/prefix_streaming/services.xml
index 2468d14981a..7a105089600 100644
--- a/config-model/src/test/cfg/application/validation/prefix_streaming/services.xml
+++ b/config-model/src/test/cfg/application/validation/prefix_streaming/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_fail/schemas/simple.sd b/config-model/src/test/cfg/application/validation/ranking_constants_fail/schemas/simple.sd
index 8b782a01946..c028228e557 100644
--- a/config-model/src/test/cfg/application/validation/ranking_constants_fail/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/ranking_constants_fail/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {}
diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml b/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml
index 9db7ea324bf..d843cc2c365 100644
--- a/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml
+++ b/config-model/src/test/cfg/application/validation/ranking_constants_fail/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_ok/schemas/simple.sd b/config-model/src/test/cfg/application/validation/ranking_constants_ok/schemas/simple.sd
index 8b782a01946..c028228e557 100644
--- a/config-model/src/test/cfg/application/validation/ranking_constants_ok/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/ranking_constants_ok/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {}
diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_ok/services.xml b/config-model/src/test/cfg/application/validation/ranking_constants_ok/services.xml
index 9db7ea324bf..d843cc2c365 100644
--- a/config-model/src/test/cfg/application/validation/ranking_constants_ok/services.xml
+++ b/config-model/src/test/cfg/application/validation/ranking_constants_ok/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/hosts.xml b/config-model/src/test/cfg/application/validation/search_alltypes/hosts.xml
index 9eafb2106cb..54e4487ce77 100644
--- a/config-model/src/test/cfg/application/validation/search_alltypes/hosts.xml
+++ b/config-model/src/test/cfg/application/validation/search_alltypes/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/schemas/parent.sd b/config-model/src/test/cfg/application/validation/search_alltypes/schemas/parent.sd
index 8decebc6680..a3dfa6074f5 100644
--- a/config-model/src/test/cfg/application/validation/search_alltypes/schemas/parent.sd
+++ b/config-model/src/test/cfg/application/validation/search_alltypes/schemas/parent.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search parent {
document parent {
}
diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/schemas/simple.sd b/config-model/src/test/cfg/application/validation/search_alltypes/schemas/simple.sd
index 242a7493df3..9f6574d3b1b 100644
--- a/config-model/src/test/cfg/application/validation/search_alltypes/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/search_alltypes/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {
field my_pos type position { indexing: summary }
diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/services.xml b/config-model/src/test/cfg/application/validation/search_alltypes/services.xml
index 68a231dec44..a2a1d6985f7 100644
--- a/config-model/src/test/cfg/application/validation/search_alltypes/services.xml
+++ b/config-model/src/test/cfg/application/validation/search_alltypes/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/search_empty_content/hosts.xml b/config-model/src/test/cfg/application/validation/search_empty_content/hosts.xml
index 9eafb2106cb..54e4487ce77 100644
--- a/config-model/src/test/cfg/application/validation/search_empty_content/hosts.xml
+++ b/config-model/src/test/cfg/application/validation/search_empty_content/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/validation/search_empty_content/schemas/simple.sd b/config-model/src/test/cfg/application/validation/search_empty_content/schemas/simple.sd
index 51512363fbc..1afaed173a7 100644
--- a/config-model/src/test/cfg/application/validation/search_empty_content/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/search_empty_content/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {
field foo type raw { }
diff --git a/config-model/src/test/cfg/application/validation/search_empty_content/services.xml b/config-model/src/test/cfg/application/validation/search_empty_content/services.xml
index 9db7ea324bf..d843cc2c365 100644
--- a/config-model/src/test/cfg/application/validation/search_empty_content/services.xml
+++ b/config-model/src/test/cfg/application/validation/search_empty_content/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />
diff --git a/config-model/src/test/cfg/application/validation/search_struct/hosts.xml b/config-model/src/test/cfg/application/validation/search_struct/hosts.xml
index 9eafb2106cb..54e4487ce77 100644
--- a/config-model/src/test/cfg/application/validation/search_struct/hosts.xml
+++ b/config-model/src/test/cfg/application/validation/search_struct/hosts.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<hosts>
<host name="localhost">
<alias>node1</alias>
diff --git a/config-model/src/test/cfg/application/validation/search_struct/schemas/simple.sd b/config-model/src/test/cfg/application/validation/search_struct/schemas/simple.sd
index 0ab072111c5..7f18b63d29b 100644
--- a/config-model/src/test/cfg/application/validation/search_struct/schemas/simple.sd
+++ b/config-model/src/test/cfg/application/validation/search_struct/schemas/simple.sd
@@ -1,4 +1,4 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
search simple {
document simple {
field foo type my_struct { }
diff --git a/config-model/src/test/cfg/application/validation/search_struct/services.xml b/config-model/src/test/cfg/application/validation/search_struct/services.xml
index 9db7ea324bf..d843cc2c365 100644
--- a/config-model/src/test/cfg/application/validation/search_struct/services.xml
+++ b/config-model/src/test/cfg/application/validation/search_struct/services.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<services>
<admin version="2.0">
<adminserver hostalias="node1" />