diff --git a/pkg/adt/example_test.go b/pkg/adt/example_test.go
index e23aae4efd3..caa5317cd11 100644
--- a/pkg/adt/example_test.go
+++ b/pkg/adt/example_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/adt/interval_tree.go b/pkg/adt/interval_tree.go
index a3ec803f64f..ab311c6d677 100644
--- a/pkg/adt/interval_tree.go
+++ b/pkg/adt/interval_tree.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/adt/interval_tree_test.go b/pkg/adt/interval_tree_test.go
index 6cc540265ae..f8d038b722e 100644
--- a/pkg/adt/interval_tree_test.go
+++ b/pkg/adt/interval_tree_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/contention/contention.go b/pkg/contention/contention.go
index 9a96a8d77ab..26ce9a2f347 100644
--- a/pkg/contention/contention.go
+++ b/pkg/contention/contention.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/cors/cors.go b/pkg/cors/cors.go
index 4a8c79c9217..0c64f16a390 100644
--- a/pkg/cors/cors.go
+++ b/pkg/cors/cors.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/cors/cors_test.go b/pkg/cors/cors_test.go
index 6c39b38d153..d36e9c0c6c7 100644
--- a/pkg/cors/cors_test.go
+++ b/pkg/cors/cors_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/expect/expect.go b/pkg/expect/expect.go
index d5256a3dd5c..819c4d2e440 100644
--- a/pkg/expect/expect.go
+++ b/pkg/expect/expect.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/expect/expect_test.go b/pkg/expect/expect_test.go
index 95b89e48955..d5cdaef5893 100644
--- a/pkg/expect/expect_test.go
+++ b/pkg/expect/expect_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go
index 145886a1a03..4cdb10d3926 100644
--- a/pkg/fileutil/fileutil.go
+++ b/pkg/fileutil/fileutil.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/fileutil_test.go b/pkg/fileutil/fileutil_test.go
index 89d12088cce..f0674cd9d18 100644
--- a/pkg/fileutil/fileutil_test.go
+++ b/pkg/fileutil/fileutil_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/lock.go b/pkg/fileutil/lock.go
index da2b92c7314..338627f43c8 100644
--- a/pkg/fileutil/lock.go
+++ b/pkg/fileutil/lock.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/lock_flock.go b/pkg/fileutil/lock_flock.go
index 2da93ace645..542550bc8a9 100644
--- a/pkg/fileutil/lock_flock.go
+++ b/pkg/fileutil/lock_flock.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/lock_linux.go b/pkg/fileutil/lock_linux.go
index 6551f575c8d..dec25a1af44 100644
--- a/pkg/fileutil/lock_linux.go
+++ b/pkg/fileutil/lock_linux.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/lock_plan9.go b/pkg/fileutil/lock_plan9.go
index 1c924a7e5f6..7432443bf73 100644
--- a/pkg/fileutil/lock_plan9.go
+++ b/pkg/fileutil/lock_plan9.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/lock_solaris.go b/pkg/fileutil/lock_solaris.go
index 0d5375aee74..352ca5590d1 100644
--- a/pkg/fileutil/lock_solaris.go
+++ b/pkg/fileutil/lock_solaris.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/lock_test.go b/pkg/fileutil/lock_test.go
index d05605684d8..2c4ed2da576 100644
--- a/pkg/fileutil/lock_test.go
+++ b/pkg/fileutil/lock_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/lock_unix.go b/pkg/fileutil/lock_unix.go
index 5fc1c8aee59..ed01164de6e 100644
--- a/pkg/fileutil/lock_unix.go
+++ b/pkg/fileutil/lock_unix.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/lock_windows.go b/pkg/fileutil/lock_windows.go
index 67a425a9124..8698f4a8d11 100644
--- a/pkg/fileutil/lock_windows.go
+++ b/pkg/fileutil/lock_windows.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/preallocate.go b/pkg/fileutil/preallocate.go
index 8cd03f015e4..e239e524a0c 100644
--- a/pkg/fileutil/preallocate.go
+++ b/pkg/fileutil/preallocate.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/preallocate_darwin.go b/pkg/fileutil/preallocate_darwin.go
index 5ac19508a7c..1ed09c560f2 100644
--- a/pkg/fileutil/preallocate_darwin.go
+++ b/pkg/fileutil/preallocate_darwin.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/preallocate_test.go b/pkg/fileutil/preallocate_test.go
index 41b7f66c742..c6a357c59b6 100644
--- a/pkg/fileutil/preallocate_test.go
+++ b/pkg/fileutil/preallocate_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/preallocate_unix.go b/pkg/fileutil/preallocate_unix.go
index b71113e7259..fa595e043b6 100644
--- a/pkg/fileutil/preallocate_unix.go
+++ b/pkg/fileutil/preallocate_unix.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/preallocate_unsupported.go b/pkg/fileutil/preallocate_unsupported.go
index 7f94a3653ef..162fbc5f782 100644
--- a/pkg/fileutil/preallocate_unsupported.go
+++ b/pkg/fileutil/preallocate_unsupported.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/purge.go b/pkg/fileutil/purge.go
index 0d1bd99c0d6..c051697e9f5 100644
--- a/pkg/fileutil/purge.go
+++ b/pkg/fileutil/purge.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/purge_test.go b/pkg/fileutil/purge_test.go
index 2b3e8667ea8..3cc62206469 100644
--- a/pkg/fileutil/purge_test.go
+++ b/pkg/fileutil/purge_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/sync.go b/pkg/fileutil/sync.go
index a089154ef45..54dd41f4f35 100644
--- a/pkg/fileutil/sync.go
+++ b/pkg/fileutil/sync.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/sync_darwin.go b/pkg/fileutil/sync_darwin.go
index 07423ffbb02..c2f39bf204d 100644
--- a/pkg/fileutil/sync_darwin.go
+++ b/pkg/fileutil/sync_darwin.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/fileutil/sync_linux.go b/pkg/fileutil/sync_linux.go
index b923996f98b..1bbced915e9 100644
--- a/pkg/fileutil/sync_linux.go
+++ b/pkg/fileutil/sync_linux.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/flags/flag.go b/pkg/flags/flag.go
index 00331e4c2b2..7c888b9f815 100644
--- a/pkg/flags/flag.go
+++ b/pkg/flags/flag.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/flags/flag_test.go b/pkg/flags/flag_test.go
index cd48ca20e8d..c89d742e1b6 100644
--- a/pkg/flags/flag_test.go
+++ b/pkg/flags/flag_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/flags/ipaddressport.go b/pkg/flags/ipaddressport.go
index b13818b6f8d..c4d62c255d9 100644
--- a/pkg/flags/ipaddressport.go
+++ b/pkg/flags/ipaddressport.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/flags/ipaddressport_test.go b/pkg/flags/ipaddressport_test.go
index 68b08e1ede6..0bb60ef9c7e 100644
--- a/pkg/flags/ipaddressport_test.go
+++ b/pkg/flags/ipaddressport_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/flags/strings.go b/pkg/flags/strings.go
index 18f00869e3d..21ff916a63a 100644
--- a/pkg/flags/strings.go
+++ b/pkg/flags/strings.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/flags/strings_test.go b/pkg/flags/strings_test.go
index c2932659ae4..351085a312c 100644
--- a/pkg/flags/strings_test.go
+++ b/pkg/flags/strings_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go
index 6d28129d764..6383d7e9257 100644
--- a/pkg/flags/urls.go
+++ b/pkg/flags/urls.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/flags/urls_test.go b/pkg/flags/urls_test.go
index 8591773e56a..bcccdfaaa57 100644
--- a/pkg/flags/urls_test.go
+++ b/pkg/flags/urls_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/idutil/id.go b/pkg/idutil/id.go
index 6f1d379112a..931beb2d058 100644
--- a/pkg/idutil/id.go
+++ b/pkg/idutil/id.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/idutil/id_test.go b/pkg/idutil/id_test.go
index 19e2a8ff11f..ddcbc6d3460 100644
--- a/pkg/idutil/id_test.go
+++ b/pkg/idutil/id_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/ioutil/readcloser.go b/pkg/ioutil/readcloser.go
index 7c1fda1c289..4aeb0c7b016 100644
--- a/pkg/ioutil/readcloser.go
+++ b/pkg/ioutil/readcloser.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/ioutil/reader.go b/pkg/ioutil/reader.go
index 8ef9a933070..0703ed476d8 100644
--- a/pkg/ioutil/reader.go
+++ b/pkg/ioutil/reader.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/ioutil/reader_test.go b/pkg/ioutil/reader_test.go
index 5f7c97b0f18..06ff2906c40 100644
--- a/pkg/ioutil/reader_test.go
+++ b/pkg/ioutil/reader_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/ioutil/util.go b/pkg/ioutil/util.go
index 6098da2829a..192ad888c24 100644
--- a/pkg/ioutil/util.go
+++ b/pkg/ioutil/util.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/logutil/merge_logger.go b/pkg/logutil/merge_logger.go
index 8e82c520af4..cc750f4d3d6 100644
--- a/pkg/logutil/merge_logger.go
+++ b/pkg/logutil/merge_logger.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/logutil/merge_logger_test.go b/pkg/logutil/merge_logger_test.go
index 99deaf17493..8fe47cf72ec 100644
--- a/pkg/logutil/merge_logger_test.go
+++ b/pkg/logutil/merge_logger_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/mock/mockstorage/storage_recorder.go b/pkg/mock/mockstorage/storage_recorder.go
index 22a04cb553d..4a592545e3b 100644
--- a/pkg/mock/mockstorage/storage_recorder.go
+++ b/pkg/mock/mockstorage/storage_recorder.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/mock/mockstore/store_recorder.go b/pkg/mock/mockstore/store_recorder.go
index af4e22e21d1..7735cc3dfa7 100644
--- a/pkg/mock/mockstore/store_recorder.go
+++ b/pkg/mock/mockstore/store_recorder.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/mock/mockwait/wait_recorder.go b/pkg/mock/mockwait/wait_recorder.go
index e83f725665c..efc198a19ea 100644
--- a/pkg/mock/mockwait/wait_recorder.go
+++ b/pkg/mock/mockwait/wait_recorder.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/netutil/isolate_linux.go b/pkg/netutil/isolate_linux.go
index c61f16c58a3..c866cea8ee1 100644
--- a/pkg/netutil/isolate_linux.go
+++ b/pkg/netutil/isolate_linux.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/netutil/isolate_stub.go b/pkg/netutil/isolate_stub.go
index d517fd688e0..7f4c3e67c2a 100644
--- a/pkg/netutil/isolate_stub.go
+++ b/pkg/netutil/isolate_stub.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go
index 4292cd06f63..b13ebcc9381 100644
--- a/pkg/netutil/netutil.go
+++ b/pkg/netutil/netutil.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/netutil/netutil_test.go b/pkg/netutil/netutil_test.go
index 9ac84a8d2e9..9ecc4026869 100644
--- a/pkg/netutil/netutil_test.go
+++ b/pkg/netutil/netutil_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/osutil/interrupt_unix.go b/pkg/osutil/interrupt_unix.go
index 2173857471a..2d1518a3bf5 100644
--- a/pkg/osutil/interrupt_unix.go
+++ b/pkg/osutil/interrupt_unix.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/osutil/interrupt_windows.go b/pkg/osutil/interrupt_windows.go
index 89e04211952..013ae88e1a7 100644
--- a/pkg/osutil/interrupt_windows.go
+++ b/pkg/osutil/interrupt_windows.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go
index bea3c1e651f..9dd49ca3c20 100644
--- a/pkg/osutil/osutil.go
+++ b/pkg/osutil/osutil.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/osutil/osutil_test.go b/pkg/osutil/osutil_test.go
index bb86819259e..8bc5ea8df1e 100644
--- a/pkg/osutil/osutil_test.go
+++ b/pkg/osutil/osutil_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/pathutil/path_test.go b/pkg/pathutil/path_test.go
index 6d3d803cfce..209fdc93c13 100644
--- a/pkg/pathutil/path_test.go
+++ b/pkg/pathutil/path_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/pbutil/pbutil.go b/pkg/pbutil/pbutil.go
index 9d640a8af6f..8f96b4d5490 100644
--- a/pkg/pbutil/pbutil.go
+++ b/pkg/pbutil/pbutil.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/pbutil/pbutil_test.go b/pkg/pbutil/pbutil_test.go
index 79d48f85c5f..fd361ec502a 100644
--- a/pkg/pbutil/pbutil_test.go
+++ b/pkg/pbutil/pbutil_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/runtime/fds_linux.go b/pkg/runtime/fds_linux.go
index d8111440559..8e9359db28c 100644
--- a/pkg/runtime/fds_linux.go
+++ b/pkg/runtime/fds_linux.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/runtime/fds_other.go b/pkg/runtime/fds_other.go
index 0ed152f0f35..0cbdb88c7a6 100644
--- a/pkg/runtime/fds_other.go
+++ b/pkg/runtime/fds_other.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/schedule/schedule.go b/pkg/schedule/schedule.go
index d566364b164..79c59b01288 100644
--- a/pkg/schedule/schedule.go
+++ b/pkg/schedule/schedule.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/schedule/schedule_test.go b/pkg/schedule/schedule_test.go
index dc2dab193d6..88c5bf3c972 100644
--- a/pkg/schedule/schedule_test.go
+++ b/pkg/schedule/schedule_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/testutil/leak_test.go b/pkg/testutil/leak_test.go
index 98290788df6..c6f34efcf80 100644
--- a/pkg/testutil/leak_test.go
+++ b/pkg/testutil/leak_test.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/testutil/pauseable_handler.go b/pkg/testutil/pauseable_handler.go
index 99582810253..e0d6aca26df 100644
--- a/pkg/testutil/pauseable_handler.go
+++ b/pkg/testutil/pauseable_handler.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/testutil/recorder.go b/pkg/testutil/recorder.go
index 326edaf3744..bdbbd8cc5d5 100644
--- a/pkg/testutil/recorder.go
+++ b/pkg/testutil/recorder.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go
index a789667b5c0..a67eded1e2d 100644
--- a/pkg/testutil/testutil.go
+++ b/pkg/testutil/testutil.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/tlsutil/tlsutil.go b/pkg/tlsutil/tlsutil.go
index 340dd2c09d0..79b1f632ed5 100644
--- a/pkg/tlsutil/tlsutil.go
+++ b/pkg/tlsutil/tlsutil.go
@@ -1,4 +1,4 @@
-// Copyright 2016 CoreOS, Inc.
+// Copyright 2016 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/doc.go b/pkg/transport/doc.go
index 4411e448751..37658ce591a 100644
--- a/pkg/transport/doc.go
+++ b/pkg/transport/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/keepalive_listener.go b/pkg/transport/keepalive_listener.go
index ee9a3a13e5b..6ccae4ee4a1 100644
--- a/pkg/transport/keepalive_listener.go
+++ b/pkg/transport/keepalive_listener.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/keepalive_listener_test.go b/pkg/transport/keepalive_listener_test.go
index e4694a3eccd..67f21fe5d4b 100644
--- a/pkg/transport/keepalive_listener_test.go
+++ b/pkg/transport/keepalive_listener_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/limit_listen.go b/pkg/transport/limit_listen.go
index ad2bc417c21..930c542066f 100644
--- a/pkg/transport/limit_listen.go
+++ b/pkg/transport/limit_listen.go
@@ -1,6 +1,16 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// Copyright 2013 The etcd Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 // Package transport provides network utility functions, complementing the more
 // common ones in the net package.
diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go
index 931652d3f13..6c8086be23b 100644
--- a/pkg/transport/listener.go
+++ b/pkg/transport/listener.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/listener_test.go b/pkg/transport/listener_test.go
index 0c45bc0d8f8..d5ff317892f 100644
--- a/pkg/transport/listener_test.go
+++ b/pkg/transport/listener_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/timeout_conn.go b/pkg/transport/timeout_conn.go
index daca554e932..7e8c02030fe 100644
--- a/pkg/transport/timeout_conn.go
+++ b/pkg/transport/timeout_conn.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/timeout_dialer.go b/pkg/transport/timeout_dialer.go
index 9bd61298043..6ae39ecfc9b 100644
--- a/pkg/transport/timeout_dialer.go
+++ b/pkg/transport/timeout_dialer.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/timeout_dialer_test.go b/pkg/transport/timeout_dialer_test.go
index 14e95516c20..51e34d3d781 100644
--- a/pkg/transport/timeout_dialer_test.go
+++ b/pkg/transport/timeout_dialer_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/timeout_listener.go b/pkg/transport/timeout_listener.go
index bf12ba6ed1d..f176c43b95d 100644
--- a/pkg/transport/timeout_listener.go
+++ b/pkg/transport/timeout_listener.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/timeout_listener_test.go b/pkg/transport/timeout_listener_test.go
index 6912e7c3e92..be2495d47b2 100644
--- a/pkg/transport/timeout_listener_test.go
+++ b/pkg/transport/timeout_listener_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/timeout_transport.go b/pkg/transport/timeout_transport.go
index e894c6e4f34..d59d268fdb5 100644
--- a/pkg/transport/timeout_transport.go
+++ b/pkg/transport/timeout_transport.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/transport/timeout_transport_test.go b/pkg/transport/timeout_transport_test.go
index e218ebeabeb..f64fd01f3ab 100644
--- a/pkg/transport/timeout_transport_test.go
+++ b/pkg/transport/timeout_transport_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/doc.go b/pkg/types/doc.go
index 04b4c38d1ca..de8ef0bd712 100644
--- a/pkg/types/doc.go
+++ b/pkg/types/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/id.go b/pkg/types/id.go
index 88cb9e63494..1b042d9ce65 100644
--- a/pkg/types/id.go
+++ b/pkg/types/id.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/id_test.go b/pkg/types/id_test.go
index 97d168f58e2..bec2853432b 100644
--- a/pkg/types/id_test.go
+++ b/pkg/types/id_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/set.go b/pkg/types/set.go
index bb997174c77..73ef431bef1 100644
--- a/pkg/types/set.go
+++ b/pkg/types/set.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/set_test.go b/pkg/types/set_test.go
index ff1ecc68d3c..7596577e9a5 100644
--- a/pkg/types/set_test.go
+++ b/pkg/types/set_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/slice.go b/pkg/types/slice.go
index 0327950f706..0dd9ca798ae 100644
--- a/pkg/types/slice.go
+++ b/pkg/types/slice.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/slice_test.go b/pkg/types/slice_test.go
index 95e37e04d20..8d8a4d0ea70 100644
--- a/pkg/types/slice_test.go
+++ b/pkg/types/slice_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/urls.go b/pkg/types/urls.go
index 8d5ff624811..e532722ac76 100644
--- a/pkg/types/urls.go
+++ b/pkg/types/urls.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/urls_test.go b/pkg/types/urls_test.go
index ffa2cf007b5..b91d1a92649 100644
--- a/pkg/types/urls_test.go
+++ b/pkg/types/urls_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/urlsmap.go b/pkg/types/urlsmap.go
index 4fe9218c745..e2579e2ca6f 100644
--- a/pkg/types/urlsmap.go
+++ b/pkg/types/urlsmap.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/types/urlsmap_test.go b/pkg/types/urlsmap_test.go
index 5205cdeb0b7..6962f393df9 100644
--- a/pkg/types/urlsmap_test.go
+++ b/pkg/types/urlsmap_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/wait/wait.go b/pkg/wait/wait.go
index 07f9944ffbf..a341c02708d 100644
--- a/pkg/wait/wait.go
+++ b/pkg/wait/wait.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/wait/wait_test.go b/pkg/wait/wait_test.go
index 3de65a69ea4..f9abec5a169 100644
--- a/pkg/wait/wait_test.go
+++ b/pkg/wait/wait_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/wait/wait_time.go b/pkg/wait/wait_time.go
index 7911e404fdb..0357d81f361 100644
--- a/pkg/wait/wait_time.go
+++ b/pkg/wait/wait_time.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/pkg/wait/wait_time_test.go b/pkg/wait/wait_time_test.go
index c194600af27..49fb2fe5a84 100644
--- a/pkg/wait/wait_time_test.go
+++ b/pkg/wait/wait_time_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015 CoreOS, Inc.
+// Copyright 2015 The etcd Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.