Revert "Update copyright headers"

45 files changed, 38 insertions, 45 deletions

diff --git a/jrt_test/CMakeLists.txt b/jrt_test/CMakeLists.txt
index 6a731460d89..007611e632c 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 2016 Yahoo Inc. 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..2a13e81355a 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 2016 Yahoo Inc. 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 c294a263641..d5c7a8eec7d 100755
--- a/jrt_test/src/binref/compilejava.in
+++ b/jrt_test/src/binref/compilejava.in
@@ -1,5 +1,4 @@
 #!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 unset VESPA_LOG_TARGET
 CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar
 CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar 
diff --git a/jrt_test/src/binref/env.sh.in b/jrt_test/src/binref/env.sh.in
index 45c7c25976f..ffe136defbe 100644
--- a/jrt_test/src/binref/env.sh.in
+++ b/jrt_test/src/binref/env.sh.in
@@ -1,4 +1,3 @@
-# Copyright 2017 Yahoo Holdings. 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 49a213c9719..5f3a5addd7e 100755
--- a/jrt_test/src/binref/runjava.in
+++ b/jrt_test/src/binref/runjava.in
@@ -1,5 +1,4 @@
 #!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 unset VESPA_LOG_TARGET
 CLASSPATH=@PROJECT_SOURCE_DIR@/jrt/target/jrt.jar
 CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/vespajlib/target/vespajlib.jar
diff --git a/jrt_test/src/java/CMakeLists.txt b/jrt_test/src/java/CMakeLists.txt
index 657d0e94ca7..60ebc1b930b 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 2016 Yahoo Inc. 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..3fcc51dcb39 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 2016 Yahoo Inc. 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..d9f0e934d18 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 2016 Yahoo Inc. 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..bf47762e139 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 2016 Yahoo Inc. 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 8e88cee2c49..b2859b65f65 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 2016 Yahoo Inc. 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/build.xml b/jrt_test/src/java/build.xml
index b6b141300a1..1b9afee3d15 100644
--- a/jrt_test/src/java/build.xml
+++ b/jrt_test/src/java/build.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 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <project basedir="." default="all" name="jrt-test">
     <!-- Written to assume that classpath is rooted in the current directory. -->
     <!-- So this should be OK if you make this script in the root of a filesystem. -->
diff --git a/jrt_test/src/jrt-test/simpleserver/CMakeLists.txt b/jrt_test/src/jrt-test/simpleserver/CMakeLists.txt
index 402c6144574..9c88dacdb1d 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 2016 Yahoo Inc. 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 ed7ff0e40bc..19ebdb253a3 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 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/jrt_test/src/tests/connect-close/CMakeLists.txt b/jrt_test/src/tests/connect-close/CMakeLists.txt
index adece6dd711..5c90dd5bfcc 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 2016 Yahoo Inc. 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..8d42e821887 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 2016 Yahoo Inc. 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..bb4786ed582 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 2016 Yahoo Inc. 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..bf54fba26ca 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 2016 Yahoo Inc. 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 18e5892ef71..14faac3ca9e 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 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/jrt_test/src/tests/echo/echo_test.sh b/jrt_test/src/tests/echo/echo_test.sh
index 6cfacc944cb..aabe3a10a25 100755
--- a/jrt_test/src/tests/echo/echo_test.sh
+++ b/jrt_test/src/tests/echo/echo_test.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# Copyright 2017 Yahoo Holdings. 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..4a3053ad64e 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 2016 Yahoo Inc. 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..5c90dd5bfcc 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 2016 Yahoo Inc. 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..65d935e81a7 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 2016 Yahoo Inc. 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..5c90dd5bfcc 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 2016 Yahoo Inc. 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..d3fdb32ce59 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 2016 Yahoo Inc. 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..a9fe3bae7b0 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 2016 Yahoo Inc. 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..e6773456475 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 2016 Yahoo Inc. 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 a465316343d..9857ea073c2 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 2016 Yahoo Inc. 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/frt.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..ba0bc04997f 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,4 @@
 #!/bin/bash
-# Copyright 2017 Yahoo Holdings. 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..aa7ae4ab3ca 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 2016 Yahoo Inc. 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..26424f240e9 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 2016 Yahoo Inc. 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..aa5a59c780d 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 2016 Yahoo Inc. 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..65796f535d4 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 2016 Yahoo Inc. 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..dcb0666fdac 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,4 @@
 #!/bin/bash
-# Copyright 2017 Yahoo Holdings. 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 32c9bcc6c21..41624eaf108 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 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
diff --git a/jrt_test/src/tests/mockup-invoke/progdefs.sh b/jrt_test/src/tests/mockup-invoke/progdefs.sh
index 6d9ed78a3a2..4c483b8060b 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 2016 Yahoo Inc. 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..5802036a97e 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 2016 Yahoo Inc. 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..cc25935141f 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 2016 Yahoo Inc. 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..5c68309f462 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 2016 Yahoo Inc. 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..c7425f18bd9 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 2016 Yahoo Inc. 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..c30dae9dc82 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,4 @@
 #!/bin/bash
-# Copyright 2017 Yahoo Holdings. 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 22e1007a517..184e733da82 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 2016 Yahoo Inc. 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/frt.h>
 
diff --git a/jrt_test/src/tests/slobrok-api/CMakeLists.txt b/jrt_test/src/tests/slobrok-api/CMakeLists.txt
index adece6dd711..5c90dd5bfcc 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 2016 Yahoo Inc. 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..5fd88f27b80 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 2016 Yahoo Inc. 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..e413d774e1b 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 2016 Yahoo Inc. 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..3cc4ef3a340 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 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 prog slobrok 1 "-p $PORT_8" $SLOBROK