diff --git a/include/grpc++/generic/async_generic_service.h b/include/grpc++/generic/async_generic_service.h
index f209c077e6c..33045b8d859 100644
--- a/include/grpc++/generic/async_generic_service.h
+++ b/include/grpc++/generic/async_generic_service.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -76,4 +76,4 @@ class AsyncGenericService GRPC_FINAL {
 
 }  // namespace grpc
 
-#endif  // GRPCXX_GENERIC_ASYNC_GENERIC_SERVICE_H
+#endif  // GRPCXX_GENERIC_ASYNC_GENERIC_SERVICE_H
\ No newline at end of file
diff --git a/include/grpc++/support/byte_buffer.h b/include/grpc++/support/byte_buffer.h
index d3f9b7b1d1f..be1957ac84a 100644
--- a/include/grpc++/support/byte_buffer.h
+++ b/include/grpc++/support/byte_buffer.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,4 +107,4 @@ class SerializationTraits<ByteBuffer, void> {
 
 }  // namespace grpc
 
-#endif  // GRPCXX_SUPPORT_BYTE_BUFFER_H
+#endif  // GRPCXX_SUPPORT_BYTE_BUFFER_H
\ No newline at end of file
diff --git a/include/grpc++/support/slice.h b/include/grpc++/support/slice.h
index 8dce7e68af9..30325ef90bf 100644
--- a/include/grpc++/support/slice.h
+++ b/include/grpc++/support/slice.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,4 +85,4 @@ class Slice GRPC_FINAL {
 
 }  // namespace grpc
 
-#endif  // GRPCXX_SUPPORT_SLICE_H
+#endif  // GRPCXX_SUPPORT_SLICE_H
\ No newline at end of file
diff --git a/src/cpp/util/byte_buffer.cc b/src/cpp/util/byte_buffer.cc
index 5245739c89b..1c1d55271da 100644
--- a/src/cpp/util/byte_buffer.cc
+++ b/src/cpp/util/byte_buffer.cc
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -89,4 +89,4 @@ ByteBuffer& ByteBuffer::operator=(const ByteBuffer& buf) {
   return *this;
 }
 
-}  // namespace grpc
+}  // namespace grpc
\ No newline at end of file
diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h
index 03bbf03b6c3..0159f4f1e67 100644
--- a/test/cpp/qps/client.h
+++ b/test/cpp/qps/client.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -377,4 +377,4 @@ std::unique_ptr<Client> CreateGenericAsyncStreamingClient(
 }  // namespace testing
 }  // namespace grpc
 
-#endif
+#endif
\ No newline at end of file
diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc
index af55187b2bc..d822d78aac0 100644
--- a/test/cpp/qps/client_async.cc
+++ b/test/cpp/qps/client_async.cc
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -605,4 +605,4 @@ std::unique_ptr<Client> CreateGenericAsyncStreamingClient(
 }
 
 }  // namespace testing
-}  // namespace grpc
+}  // namespace grpc
\ No newline at end of file
diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc
index 54cdf390d70..1045915b832 100644
--- a/test/cpp/qps/client_sync.cc
+++ b/test/cpp/qps/client_sync.cc
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -172,4 +172,4 @@ std::unique_ptr<Client> CreateSynchronousStreamingClient(
 }
 
 }  // namespace testing
-}  // namespace grpc
+}  // namespace grpc
\ No newline at end of file
diff --git a/test/cpp/qps/generic_async_streaming_ping_pong_test.cc b/test/cpp/qps/generic_async_streaming_ping_pong_test.cc
index fe79b2d8037..7a1275054a6 100644
--- a/test/cpp/qps/generic_async_streaming_ping_pong_test.cc
+++ b/test/cpp/qps/generic_async_streaming_ping_pong_test.cc
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -79,4 +79,4 @@ int main(int argc, char** argv) {
 
   grpc::testing::RunGenericAsyncStreamingPingPong();
   return 0;
-}
+}
\ No newline at end of file
diff --git a/test/cpp/qps/qps_driver.cc b/test/cpp/qps/qps_driver.cc
index a8d404590c4..76d1595c4ba 100644
--- a/test/cpp/qps/qps_driver.cc
+++ b/test/cpp/qps/qps_driver.cc
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -117,7 +117,7 @@ static void QpsDriver() {
     params->set_resp_size(FLAGS_bbuf_resp_size);
     if (FLAGS_bbuf_req_size >= 0) {
       params->set_req_size(FLAGS_bbuf_req_size);
-    }    
+    }
   } else {
     // set a reasonable default: proto but no payload
     client_config.mutable_payload_config()->mutable_simple_params();
@@ -184,4 +184,4 @@ int main(int argc, char** argv) {
   grpc::testing::QpsDriver();
 
   return 0;
-}
+}
\ No newline at end of file
diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc
index ef2b633f68a..e7714c0bb30 100644
--- a/test/cpp/qps/qps_worker.cc
+++ b/test/cpp/qps/qps_worker.cc
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -239,4 +239,4 @@ QpsWorker::QpsWorker(int driver_port) {
 QpsWorker::~QpsWorker() {}
 
 }  // namespace testing
-}  // namespace grpc
+}  // namespace grpc
\ No newline at end of file
diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h
index 920fc563566..daee7c36634 100644
--- a/test/cpp/qps/server.h
+++ b/test/cpp/qps/server.h
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -112,4 +112,4 @@ std::unique_ptr<Server> CreateAsyncServer(const ServerConfig& config);
 }  // namespace testing
 }  // namespace grpc
 
-#endif
+#endif
\ No newline at end of file
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc
index b39d8c4d3e6..da7646eaf2c 100644
--- a/test/cpp/qps/server_async.cc
+++ b/test/cpp/qps/server_async.cc
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -403,4 +403,4 @@ std::unique_ptr<Server> CreateAsyncGenericServer(const ServerConfig &config) {
 }
 
 }  // namespace testing
-}  // namespace grpc
+}  // namespace grpc
\ No newline at end of file