Update 2017 copyright notices.

44 files changed, 44 insertions, 44 deletions

diff --git a/jrt_test/CMakeLists.txt b/jrt_test/CMakeLists.txt
index 6a731460d89..ea8c8b94faa 100644
--- a/jrt_test/CMakeLists.txt
+++ b/jrt_test/CMakeLists.txt
@@ -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.
 vespa_define_module(
     DEPENDS
     fastos
diff --git a/jrt_test/src/binref/CMakeLists.txt b/jrt_test/src/binref/CMakeLists.txt
index 9eb0d7ef8a6..da9bcdbfd8e 100644
--- a/jrt_test/src/binref/CMakeLists.txt
+++ b/jrt_test/src/binref/CMakeLists.txt
@@ -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.
 
 configure_file(compilejava.in compilejava @ONLY)
 configure_file(runjava.in runjava @ONLY)
diff --git a/jrt_test/src/binref/compilejava.in b/jrt_test/src/binref/compilejava.in
index 4bac09dc483..38764943ff7 100755
--- a/jrt_test/src/binref/compilejava.in
+++ b/jrt_test/src/binref/compilejava.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 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.
 unset VESPA_LOG_TARGET
 
 if [ -n "$VESPA_CPP_TEST_JARS" ]; then
diff --git a/jrt_test/src/binref/env.sh.in b/jrt_test/src/binref/env.sh.in
index 45c7c25976f..c15dfdebd71 100644
--- a/jrt_test/src/binref/env.sh.in
+++ b/jrt_test/src/binref/env.sh.in
@@ -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.
 BINREF=@CMAKE_CURRENT_BINARY_DIR@
 SBCMD=@PROJECT_BINARY_DIR@/slobrok/src/apps/sbcmd/vespa-slobrok-cmd
 SLOBROK=@PROJECT_BINARY_DIR@/slobrok/src/apps/slobrok/vespa-slobrok
diff --git a/jrt_test/src/binref/runjava.in b/jrt_test/src/binref/runjava.in
index 47e7b8aa66c..f87b817b35a 100755
--- a/jrt_test/src/binref/runjava.in
+++ b/jrt_test/src/binref/runjava.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# 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.
 unset VESPA_LOG_TARGET
 
 if [ -n "$VESPA_CPP_TEST_JARS" ]; then
diff --git a/jrt_test/src/java/CMakeLists.txt b/jrt_test/src/java/CMakeLists.txt
index 657d0e94ca7..097c8cebac3 100644
--- a/jrt_test/src/java/CMakeLists.txt
+++ b/jrt_test/src/java/CMakeLists.txt
@@ -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.
 file(MAKE_DIRECTORY classes)
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/java_code_compiled
                    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../binref/compilejava -d classes *.java
diff --git a/jrt_test/src/java/DummySlobrokService.java b/jrt_test/src/java/DummySlobrokService.java
index ff7d8ffe7f2..5e5613e7d3f 100644
--- a/jrt_test/src/java/DummySlobrokService.java
+++ b/jrt_test/src/java/DummySlobrokService.java
@@ -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.
 import com.yahoo.jrt.*;
 import com.yahoo.jrt.slobrok.api.*;
 
diff --git a/jrt_test/src/java/HelloWorld.java b/jrt_test/src/java/HelloWorld.java
index beb0df16e6a..cbf941ed76d 100644
--- a/jrt_test/src/java/HelloWorld.java
+++ b/jrt_test/src/java/HelloWorld.java
@@ -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.
 public class HelloWorld
 {
     public static void main(String[] args)
diff --git a/jrt_test/src/java/PollRPCServer.java b/jrt_test/src/java/PollRPCServer.java
index 2f8e75c3d25..6c84cab1ab9 100644
--- a/jrt_test/src/java/PollRPCServer.java
+++ b/jrt_test/src/java/PollRPCServer.java
@@ -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.
 
 import com.yahoo.jrt.*;
 
diff --git a/jrt_test/src/java/SimpleServer.java b/jrt_test/src/java/SimpleServer.java
index 06ade36bc8e..6c1364b2d84 100644
--- a/jrt_test/src/java/SimpleServer.java
+++ b/jrt_test/src/java/SimpleServer.java
@@ -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.
 
 import com.yahoo.jrt.*;
 
diff --git a/jrt_test/src/jrt-test/simpleserver/CMakeLists.txt b/jrt_test/src/jrt-test/simpleserver/CMakeLists.txt
index 402c6144574..21184699a98 100644
--- a/jrt_test/src/jrt-test/simpleserver/CMakeLists.txt
+++ b/jrt_test/src/jrt-test/simpleserver/CMakeLists.txt
@@ -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.
 vespa_add_executable(jrt_test_simpleserver_app
     SOURCES
     simpleserver.cpp
diff --git a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
index cf23a027905..b6269253c48 100644
--- a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
+++ b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
@@ -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.
 
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/rpcrequest.h>
diff --git a/jrt_test/src/tests/connect-close/CMakeLists.txt b/jrt_test/src/tests/connect-close/CMakeLists.txt
index adece6dd711..05c9ec571fb 100644
--- a/jrt_test/src/tests/connect-close/CMakeLists.txt
+++ b/jrt_test/src/tests/connect-close/CMakeLists.txt
@@ -1 +1 @@
-# 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.
diff --git a/jrt_test/src/tests/connect-close/Test.java b/jrt_test/src/tests/connect-close/Test.java
index c583e6c4886..055ffcfeb7c 100644
--- a/jrt_test/src/tests/connect-close/Test.java
+++ b/jrt_test/src/tests/connect-close/Test.java
@@ -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.
 
 import com.yahoo.jrt.*;
 
diff --git a/jrt_test/src/tests/echo/CMakeLists.txt b/jrt_test/src/tests/echo/CMakeLists.txt
index 001a30c9439..d90146ba67c 100644
--- a/jrt_test/src/tests/echo/CMakeLists.txt
+++ b/jrt_test/src/tests/echo/CMakeLists.txt
@@ -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.
 vespa_add_executable(jrt_test_echo-client_app TEST
     SOURCES
     echo-client.cpp
diff --git a/jrt_test/src/tests/echo/dotest.sh b/jrt_test/src/tests/echo/dotest.sh
index 321e5f88f1e..de1b564e799 100644
--- a/jrt_test/src/tests/echo/dotest.sh
+++ b/jrt_test/src/tests/echo/dotest.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 if [ -z "$SOURCE_DIRECTORY" ]; then
     SOURCE_DIRECTORY="."
 fi
diff --git a/jrt_test/src/tests/echo/echo-client.cpp b/jrt_test/src/tests/echo/echo-client.cpp
index 4bc9ac743e4..0661c8cfa2c 100644
--- a/jrt_test/src/tests/echo/echo-client.cpp
+++ b/jrt_test/src/tests/echo/echo-client.cpp
@@ -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.
 
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
diff --git a/jrt_test/src/tests/echo/echo_test.sh b/jrt_test/src/tests/echo/echo_test.sh
index 6cfacc944cb..bda5c8c0dc7 100755
--- a/jrt_test/src/tests/echo/echo_test.sh
+++ b/jrt_test/src/tests/echo/echo_test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
     SOURCE_DIRECTORY="."
diff --git a/jrt_test/src/tests/echo/progdefs.sh b/jrt_test/src/tests/echo/progdefs.sh
index 3cd554667f9..2c941ea891b 100644
--- a/jrt_test/src/tests/echo/progdefs.sh
+++ b/jrt_test/src/tests/echo/progdefs.sh
@@ -1,2 +1,2 @@
-# 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.
 prog javaserver 1 "tcp/$PORT_2" "$BINREF/runjava SimpleServer"
diff --git a/jrt_test/src/tests/garbage/CMakeLists.txt b/jrt_test/src/tests/garbage/CMakeLists.txt
index adece6dd711..05c9ec571fb 100644
--- a/jrt_test/src/tests/garbage/CMakeLists.txt
+++ b/jrt_test/src/tests/garbage/CMakeLists.txt
@@ -1 +1 @@
-# 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.
diff --git a/jrt_test/src/tests/garbage/Garbage.java b/jrt_test/src/tests/garbage/Garbage.java
index 54822b53744..77a1d8bfd7d 100644
--- a/jrt_test/src/tests/garbage/Garbage.java
+++ b/jrt_test/src/tests/garbage/Garbage.java
@@ -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.
 import com.yahoo.jrt.*;
 import java.net.Socket;
 import java.io.OutputStream;
diff --git a/jrt_test/src/tests/hello-world/CMakeLists.txt b/jrt_test/src/tests/hello-world/CMakeLists.txt
index adece6dd711..05c9ec571fb 100644
--- a/jrt_test/src/tests/hello-world/CMakeLists.txt
+++ b/jrt_test/src/tests/hello-world/CMakeLists.txt
@@ -1 +1 @@
-# 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.
diff --git a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt b/jrt_test/src/tests/mandatory-methods/CMakeLists.txt
index 939e8e7d260..33eb601c2a3 100644
--- a/jrt_test/src/tests/mandatory-methods/CMakeLists.txt
+++ b/jrt_test/src/tests/mandatory-methods/CMakeLists.txt
@@ -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.
 vespa_add_executable(jrt_test_extract-reflection_app TEST
     SOURCES
     extract-reflection.cpp
diff --git a/jrt_test/src/tests/mandatory-methods/RPCServer.java b/jrt_test/src/tests/mandatory-methods/RPCServer.java
index 85f52ee2c51..ee187e6cd74 100644
--- a/jrt_test/src/tests/mandatory-methods/RPCServer.java
+++ b/jrt_test/src/tests/mandatory-methods/RPCServer.java
@@ -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.
 
 import com.yahoo.jrt.*;
 
diff --git a/jrt_test/src/tests/mandatory-methods/dotest.sh b/jrt_test/src/tests/mandatory-methods/dotest.sh
index cad4e5a9b4f..793b1a64c82 100644
--- a/jrt_test/src/tests/mandatory-methods/dotest.sh
+++ b/jrt_test/src/tests/mandatory-methods/dotest.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
     SOURCE_DIRECTORY="."
diff --git a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
index af9f60f84d3..96f90c59645 100644
--- a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
+++ b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
@@ -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.
 
 #include <vespa/fastos/app.h>
 #include <vespa/fnet/frt/supervisor.h>
diff --git a/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh b/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh
index d8db62797a5..ca71b2b2f06 100755
--- a/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh
+++ b/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
     SOURCE_DIRECTORY="."
diff --git a/jrt_test/src/tests/mandatory-methods/progdefs.sh b/jrt_test/src/tests/mandatory-methods/progdefs.sh
index 77ea3d53124..a7d68bd322f 100644
--- a/jrt_test/src/tests/mandatory-methods/progdefs.sh
+++ b/jrt_test/src/tests/mandatory-methods/progdefs.sh
@@ -1,2 +1,2 @@
-# 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.
 prog javaserver 1 "tcp/$PORT_1" "$BINREF/runjava RPCServer"
diff --git a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt b/jrt_test/src/tests/mockup-invoke/CMakeLists.txt
index dec4df48222..494f0681b78 100644
--- a/jrt_test/src/tests/mockup-invoke/CMakeLists.txt
+++ b/jrt_test/src/tests/mockup-invoke/CMakeLists.txt
@@ -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.
 vespa_add_executable(jrt_test_mockup-server_app TEST
     SOURCES
     mockup-server.cpp
diff --git a/jrt_test/src/tests/mockup-invoke/MockupInvoke.java b/jrt_test/src/tests/mockup-invoke/MockupInvoke.java
index 71a8bf84eb5..2609921e4f6 100644
--- a/jrt_test/src/tests/mockup-invoke/MockupInvoke.java
+++ b/jrt_test/src/tests/mockup-invoke/MockupInvoke.java
@@ -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.
 
 import com.yahoo.jrt.*;
 
diff --git a/jrt_test/src/tests/mockup-invoke/dotest.sh b/jrt_test/src/tests/mockup-invoke/dotest.sh
index e7d8aeed588..0ddf87f0b51 100644
--- a/jrt_test/src/tests/mockup-invoke/dotest.sh
+++ b/jrt_test/src/tests/mockup-invoke/dotest.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
     SOURCE_DIRECTORY="."
diff --git a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh
index 4d9b1fe0aba..62347bb18a5 100755
--- a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh
+++ b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
     SOURCE_DIRECTORY="."
diff --git a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
index 1abe27407b3..cfa40f3352d 100644
--- a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
+++ b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
@@ -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.
 
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/rpcrequest.h>
diff --git a/jrt_test/src/tests/mockup-invoke/progdefs.sh b/jrt_test/src/tests/mockup-invoke/progdefs.sh
index 6d9ed78a3a2..b2661a85d53 100644
--- a/jrt_test/src/tests/mockup-invoke/progdefs.sh
+++ b/jrt_test/src/tests/mockup-invoke/progdefs.sh
@@ -1,2 +1,2 @@
-# 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.
 prog server 1 "tcp/$PORT_0" "./jrt_test_mockup-server_app"
diff --git a/jrt_test/src/tests/rpc-error/CMakeLists.txt b/jrt_test/src/tests/rpc-error/CMakeLists.txt
index 1e651a4bfba..474a7e1a829 100644
--- a/jrt_test/src/tests/rpc-error/CMakeLists.txt
+++ b/jrt_test/src/tests/rpc-error/CMakeLists.txt
@@ -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.
 vespa_add_executable(jrt_test_test-errors_app TEST
     SOURCES
     test-errors.cpp
diff --git a/jrt_test/src/tests/rpc-error/TestErrors.java b/jrt_test/src/tests/rpc-error/TestErrors.java
index 1fb67575c58..75df1a9d2ec 100644
--- a/jrt_test/src/tests/rpc-error/TestErrors.java
+++ b/jrt_test/src/tests/rpc-error/TestErrors.java
@@ -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.
 import com.yahoo.jrt.*;
 
 
diff --git a/jrt_test/src/tests/rpc-error/dotest.sh b/jrt_test/src/tests/rpc-error/dotest.sh
index 1814ff74415..a375e0a26d9 100644
--- a/jrt_test/src/tests/rpc-error/dotest.sh
+++ b/jrt_test/src/tests/rpc-error/dotest.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
     SOURCE_DIRECTORY="."
diff --git a/jrt_test/src/tests/rpc-error/progdefs.sh b/jrt_test/src/tests/rpc-error/progdefs.sh
index 4da4a30ebd3..5fd04bb9dff 100644
--- a/jrt_test/src/tests/rpc-error/progdefs.sh
+++ b/jrt_test/src/tests/rpc-error/progdefs.sh
@@ -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.
 prog cppserver 1 "tcp/$CPP_PORT" "$SIMPLESERVER"
 prog javaserver 1 "tcp/$JAVA_PORT" "$BINREF/runjava SimpleServer"
diff --git a/jrt_test/src/tests/rpc-error/rpc-error_test.sh b/jrt_test/src/tests/rpc-error/rpc-error_test.sh
index 304dc36c807..69a415500b7 100755
--- a/jrt_test/src/tests/rpc-error/rpc-error_test.sh
+++ b/jrt_test/src/tests/rpc-error/rpc-error_test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
     SOURCE_DIRECTORY="."
diff --git a/jrt_test/src/tests/rpc-error/test-errors.cpp b/jrt_test/src/tests/rpc-error/test-errors.cpp
index 1c0c057e433..86d699e530e 100644
--- a/jrt_test/src/tests/rpc-error/test-errors.cpp
+++ b/jrt_test/src/tests/rpc-error/test-errors.cpp
@@ -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.
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
diff --git a/jrt_test/src/tests/slobrok-api/CMakeLists.txt b/jrt_test/src/tests/slobrok-api/CMakeLists.txt
index adece6dd711..05c9ec571fb 100644
--- a/jrt_test/src/tests/slobrok-api/CMakeLists.txt
+++ b/jrt_test/src/tests/slobrok-api/CMakeLists.txt
@@ -1 +1 @@
-# 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.
diff --git a/jrt_test/src/tests/slobrok-api/SlobrokAPITest.java b/jrt_test/src/tests/slobrok-api/SlobrokAPITest.java
index 50b13a526e7..50d2fa5f92c 100644
--- a/jrt_test/src/tests/slobrok-api/SlobrokAPITest.java
+++ b/jrt_test/src/tests/slobrok-api/SlobrokAPITest.java
@@ -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.
 
 
 import com.yahoo.jrt.*;
diff --git a/jrt_test/src/tests/slobrok-api/dotest.sh b/jrt_test/src/tests/slobrok-api/dotest.sh
index f6e7013460d..f7dfd76dc63 100755
--- a/jrt_test/src/tests/slobrok-api/dotest.sh
+++ b/jrt_test/src/tests/slobrok-api/dotest.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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.
 
 fail=0
 
diff --git a/jrt_test/src/tests/slobrok-api/progdefs.sh b/jrt_test/src/tests/slobrok-api/progdefs.sh
index b5954e975cf..f741eda3192 100644
--- a/jrt_test/src/tests/slobrok-api/progdefs.sh
+++ b/jrt_test/src/tests/slobrok-api/progdefs.sh
@@ -1,2 +1,2 @@
-# 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.
 prog slobrok 1 "-p $PORT_8" $SLOBROK