Revert "Update copyright headers"

39 files changed, 30 insertions, 39 deletions

diff --git a/messagebus_test/CMakeLists.txt b/messagebus_test/CMakeLists.txt
index 34da1b2a3d6..96dc39327ac 100644
--- a/messagebus_test/CMakeLists.txt
+++ b/messagebus_test/CMakeLists.txt
@@ -1,4 +1,3 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_define_module(
   DEPENDS
   slobrok_slobrokserver
diff --git a/messagebus_test/src/binref/CMakeLists.txt b/messagebus_test/src/binref/CMakeLists.txt
index a28d2c521ea..20594f98d02 100644
--- a/messagebus_test/src/binref/CMakeLists.txt
+++ b/messagebus_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/messagebus_test/src/binref/compilejava.in b/messagebus_test/src/binref/compilejava.in
index da5414e3ce4..3dca3c2f3db 100755
--- a/messagebus_test/src/binref/compilejava.in
+++ b/messagebus_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@/messagebus/target/messagebus-jar-with-dependencies.jar
 CLASSPATH=$CLASSPATH:@PROJECT_SOURCE_DIR@/component/target/component.jar
diff --git a/messagebus_test/src/binref/env.sh.in b/messagebus_test/src/binref/env.sh.in
index 8ebb13dad22..d485eb9dfea 100644
--- a/messagebus_test/src/binref/env.sh.in
+++ b/messagebus_test/src/binref/env.sh.in
@@ -1,3 +1,2 @@
-# 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@
 export BINREF 
diff --git a/messagebus_test/src/binref/runjava.in b/messagebus_test/src/binref/runjava.in
index c75e4d5cbc1..f6427a1f7cc 100755
--- a/messagebus_test/src/binref/runjava.in
+++ b/messagebus_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
 unset LD_PRELOAD
 CLASSPATH=@PROJECT_SOURCE_DIR@/messagebus/target/messagebus-jar-with-dependencies.jar
diff --git a/messagebus_test/src/tests/compile-cpp/CMakeLists.txt b/messagebus_test/src/tests/compile-cpp/CMakeLists.txt
index 78e5fdb47da..86e3d7388ab 100644
--- a/messagebus_test/src/tests/compile-cpp/CMakeLists.txt
+++ b/messagebus_test/src/tests/compile-cpp/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(messagebus_test_compile-cpp_test_app TEST
     SOURCES
     compile-cpp.cpp
diff --git a/messagebus_test/src/tests/compile-cpp/compile-cpp.cpp b/messagebus_test/src/tests/compile-cpp/compile-cpp.cpp
index 2276d1e4df3..0aa174ab9b9 100644
--- a/messagebus_test/src/tests/compile-cpp/compile-cpp.cpp
+++ b/messagebus_test/src/tests/compile-cpp/compile-cpp.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/log/log.h>
 LOG_SETUP("compile-cpp_test");
 #include <vespa/vespalib/testkit/testapp.h>
diff --git a/messagebus_test/src/tests/compile-java/CMakeLists.txt b/messagebus_test/src/tests/compile-java/CMakeLists.txt
index 532bb6bc16d..f13175939f6 100644
--- a/messagebus_test/src/tests/compile-java/CMakeLists.txt
+++ b/messagebus_test/src/tests/compile-java/CMakeLists.txt
@@ -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.
 vespa_add_test(NAME messagebus_test_compile-java_test NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compile-java_test.sh)
diff --git a/messagebus_test/src/tests/compile-java/TestCompile.java b/messagebus_test/src/tests/compile-java/TestCompile.java
index 81e17ad4596..443ae093794 100644
--- a/messagebus_test/src/tests/compile-java/TestCompile.java
+++ b/messagebus_test/src/tests/compile-java/TestCompile.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.messagebus.EmptyReply;
 
diff --git a/messagebus_test/src/tests/compile-java/compile-java_test.sh b/messagebus_test/src/tests/compile-java/compile-java_test.sh
index 970a8919e95..d99e3e841e5 100755
--- a/messagebus_test/src/tests/compile-java/compile-java_test.sh
+++ b/messagebus_test/src/tests/compile-java/compile-java_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.
 set -e
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/messagebus_test/src/tests/error/CMakeLists.txt b/messagebus_test/src/tests/error/CMakeLists.txt
index 05a90b54877..926047f31cd 100644
--- a/messagebus_test/src/tests/error/CMakeLists.txt
+++ b/messagebus_test/src/tests/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(messagebus_test_error_test_app TEST
     SOURCES
     error.cpp
diff --git a/messagebus_test/src/tests/error/JavaClient.java b/messagebus_test/src/tests/error/JavaClient.java
index bb3d84d0d60..e263b3597da 100644
--- a/messagebus_test/src/tests/error/JavaClient.java
+++ b/messagebus_test/src/tests/error/JavaClient.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.messagebus.*;
 import com.yahoo.messagebus.test.*;
 import com.yahoo.config.*;
diff --git a/messagebus_test/src/tests/error/JavaServer.java b/messagebus_test/src/tests/error/JavaServer.java
index e1ad49fe142..b5321f41fc3 100644
--- a/messagebus_test/src/tests/error/JavaServer.java
+++ b/messagebus_test/src/tests/error/JavaServer.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.messagebus.*;
 import com.yahoo.messagebus.test.*;
 import com.yahoo.config.*;
diff --git a/messagebus_test/src/tests/error/cpp-client.cpp b/messagebus_test/src/tests/error/cpp-client.cpp
index 001b0b14674..10d7eb7e521 100644
--- a/messagebus_test/src/tests/error/cpp-client.cpp
+++ b/messagebus_test/src/tests/error/cpp-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/messagebus/messagebus.h>
 #include <vespa/messagebus/sourcesession.h>
diff --git a/messagebus_test/src/tests/error/cpp-server.cpp b/messagebus_test/src/tests/error/cpp-server.cpp
index 68a1d0afc27..c738c871e9a 100644
--- a/messagebus_test/src/tests/error/cpp-server.cpp
+++ b/messagebus_test/src/tests/error/cpp-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/messagebus/messagebus.h>
 #include <vespa/messagebus/testlib/simpleprotocol.h>
diff --git a/messagebus_test/src/tests/error/ctl.sh b/messagebus_test/src/tests/error/ctl.sh
index 088f5caf865..ca4fc7701e6 100755
--- a/messagebus_test/src/tests/error/ctl.sh
+++ b/messagebus_test/src/tests/error/ctl.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/messagebus_test/src/tests/error/error.cpp b/messagebus_test/src/tests/error/error.cpp
index e5749db452b..a04bdddf23f 100644
--- a/messagebus_test/src/tests/error/error.cpp
+++ b/messagebus_test/src/tests/error/error.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/log/log.h>
 LOG_SETUP("error_test");
 #include <vespa/vespalib/testkit/testapp.h>
diff --git a/messagebus_test/src/tests/error/error_test.sh b/messagebus_test/src/tests/error/error_test.sh
index d53807581f9..0c39f3d1ad3 100755
--- a/messagebus_test/src/tests/error/error_test.sh
+++ b/messagebus_test/src/tests/error/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.
 set -e
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/messagebus_test/src/tests/error/progdefs.sh b/messagebus_test/src/tests/error/progdefs.sh
index 41db062f9db..47d02d95b93 100644
--- a/messagebus_test/src/tests/error/progdefs.sh
+++ b/messagebus_test/src/tests/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 server cpp "" "./messagebus_test_cpp-server-error_app"
 prog server java "" "$BINREF/runjava JavaServer"
diff --git a/messagebus_test/src/tests/errorcodes/CMakeLists.txt b/messagebus_test/src/tests/errorcodes/CMakeLists.txt
index 474c82884b5..b996c58464c 100644
--- a/messagebus_test/src/tests/errorcodes/CMakeLists.txt
+++ b/messagebus_test/src/tests/errorcodes/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(messagebus_test_dumpcodes_app TEST
     SOURCES
     dumpcodes.cpp
diff --git a/messagebus_test/src/tests/errorcodes/DumpCodes.java b/messagebus_test/src/tests/errorcodes/DumpCodes.java
index 01003876fa3..8eb97813404 100644
--- a/messagebus_test/src/tests/errorcodes/DumpCodes.java
+++ b/messagebus_test/src/tests/errorcodes/DumpCodes.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.messagebus.ErrorCode;
 
 public class DumpCodes {
diff --git a/messagebus_test/src/tests/errorcodes/dumpcodes.cpp b/messagebus_test/src/tests/errorcodes/dumpcodes.cpp
index fdc8892b7c7..81a764d02d9 100644
--- a/messagebus_test/src/tests/errorcodes/dumpcodes.cpp
+++ b/messagebus_test/src/tests/errorcodes/dumpcodes.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/messagebus/errorcode.h>
 #include <vespa/fastos/app.h>
diff --git a/messagebus_test/src/tests/errorcodes/errorcodes_test.sh b/messagebus_test/src/tests/errorcodes/errorcodes_test.sh
index d3c3693f384..e6ecc033ef3 100755
--- a/messagebus_test/src/tests/errorcodes/errorcodes_test.sh
+++ b/messagebus_test/src/tests/errorcodes/errorcodes_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.
 set -e
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/messagebus_test/src/tests/speed/CMakeLists.txt b/messagebus_test/src/tests/speed/CMakeLists.txt
index 1b2c20ae7df..5a5f9615c42 100644
--- a/messagebus_test/src/tests/speed/CMakeLists.txt
+++ b/messagebus_test/src/tests/speed/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(messagebus_test_speed_test_app
     SOURCES
     speed.cpp
diff --git a/messagebus_test/src/tests/speed/JavaClient.java b/messagebus_test/src/tests/speed/JavaClient.java
index 0bbfc07bc97..b905ab07e91 100644
--- a/messagebus_test/src/tests/speed/JavaClient.java
+++ b/messagebus_test/src/tests/speed/JavaClient.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.messagebus.*;
 import com.yahoo.messagebus.test.*;
 import com.yahoo.config.*;
diff --git a/messagebus_test/src/tests/speed/JavaServer.java b/messagebus_test/src/tests/speed/JavaServer.java
index e9121ac3740..afec6dcdba2 100644
--- a/messagebus_test/src/tests/speed/JavaServer.java
+++ b/messagebus_test/src/tests/speed/JavaServer.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.messagebus.*;
 import com.yahoo.messagebus.test.*;
 import com.yahoo.config.*;
diff --git a/messagebus_test/src/tests/speed/cpp-client.cpp b/messagebus_test/src/tests/speed/cpp-client.cpp
index d510054c0ab..dd3def7efc9 100644
--- a/messagebus_test/src/tests/speed/cpp-client.cpp
+++ b/messagebus_test/src/tests/speed/cpp-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/messagebus/messagebus.h>
 #include <vespa/messagebus/routing/retrytransienterrorspolicy.h>
diff --git a/messagebus_test/src/tests/speed/cpp-server.cpp b/messagebus_test/src/tests/speed/cpp-server.cpp
index ba821f19b02..3d29f5641a2 100644
--- a/messagebus_test/src/tests/speed/cpp-server.cpp
+++ b/messagebus_test/src/tests/speed/cpp-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/messagebus/messagebus.h>
 #include <vespa/messagebus/testlib/simplemessage.h>
diff --git a/messagebus_test/src/tests/speed/ctl.sh b/messagebus_test/src/tests/speed/ctl.sh
index 088f5caf865..ca4fc7701e6 100755
--- a/messagebus_test/src/tests/speed/ctl.sh
+++ b/messagebus_test/src/tests/speed/ctl.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/messagebus_test/src/tests/speed/progdefs.sh b/messagebus_test/src/tests/speed/progdefs.sh
index 550d7d59b15..0b2bd600db0 100644
--- a/messagebus_test/src/tests/speed/progdefs.sh
+++ b/messagebus_test/src/tests/speed/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 server cpp "" "./messagebus_test_cpp-server-speed_app"
 prog server java "" "$BINREF/runjava JavaServer"
diff --git a/messagebus_test/src/tests/speed/speed.cpp b/messagebus_test/src/tests/speed/speed.cpp
index 44bd1f39e35..5e7128ea1db 100644
--- a/messagebus_test/src/tests/speed/speed.cpp
+++ b/messagebus_test/src/tests/speed/speed.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/log/log.h>
 LOG_SETUP("speed_test");
 #include <vespa/vespalib/testkit/testapp.h>
diff --git a/messagebus_test/src/tests/speed/speed_test.sh b/messagebus_test/src/tests/speed/speed_test.sh
index 3ab23cbb14d..1d9ba27f84e 100755
--- a/messagebus_test/src/tests/speed/speed_test.sh
+++ b/messagebus_test/src/tests/speed/speed_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.
 set -e
 
 if [ -z "$SOURCE_DIRECTORY" ]; then
diff --git a/messagebus_test/src/tests/trace/CMakeLists.txt b/messagebus_test/src/tests/trace/CMakeLists.txt
index 4ed8197c144..f43d66d9122 100644
--- a/messagebus_test/src/tests/trace/CMakeLists.txt
+++ b/messagebus_test/src/tests/trace/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(messagebus_test_trace_test_app TEST
     SOURCES
     trace.cpp
diff --git a/messagebus_test/src/tests/trace/JavaServer.java b/messagebus_test/src/tests/trace/JavaServer.java
index 899a8434900..5dfe15e3d0b 100644
--- a/messagebus_test/src/tests/trace/JavaServer.java
+++ b/messagebus_test/src/tests/trace/JavaServer.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.messagebus.*;
 import com.yahoo.messagebus.test.*;
 import com.yahoo.config.*;
diff --git a/messagebus_test/src/tests/trace/cpp-server.cpp b/messagebus_test/src/tests/trace/cpp-server.cpp
index 60bd55270a7..62ef2f82bad 100644
--- a/messagebus_test/src/tests/trace/cpp-server.cpp
+++ b/messagebus_test/src/tests/trace/cpp-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/messagebus/messagebus.h>
 #include <vespa/messagebus/testlib/simpleprotocol.h>
diff --git a/messagebus_test/src/tests/trace/ctl.sh b/messagebus_test/src/tests/trace/ctl.sh
index 088f5caf865..ca4fc7701e6 100755
--- a/messagebus_test/src/tests/trace/ctl.sh
+++ b/messagebus_test/src/tests/trace/ctl.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/messagebus_test/src/tests/trace/progdefs.sh b/messagebus_test/src/tests/trace/progdefs.sh
index 2f8c732899c..4071da4beb5 100644
--- a/messagebus_test/src/tests/trace/progdefs.sh
+++ b/messagebus_test/src/tests/trace/progdefs.sh
@@ -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.
 prog server cpp1 "" "./messagebus_test_cpp-server-trace_app server/cpp/1/A"
 prog server cpp2 "" "./messagebus_test_cpp-server-trace_app server/cpp/2/A"
 prog server cpp3 "" "./messagebus_test_cpp-server-trace_app server/cpp/2/B"
diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp
index 96759f286b8..a69565bacf3 100644
--- a/messagebus_test/src/tests/trace/trace.cpp
+++ b/messagebus_test/src/tests/trace/trace.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/log/log.h>
 LOG_SETUP("trace_test");
 #include <vespa/vespalib/testkit/testapp.h>
diff --git a/messagebus_test/src/tests/trace/trace_test.sh b/messagebus_test/src/tests/trace/trace_test.sh
index 9926545ece6..7bd344a8618 100755
--- a/messagebus_test/src/tests/trace/trace_test.sh
+++ b/messagebus_test/src/tests/trace/trace_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.
 set -e
 
 if [ -z "$SOURCE_DIRECTORY" ]; then