diff --git a/LICENSE b/LICENSE
index a037229e..bcc37fed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021-2022 Buf Technologies, Inc.
+   Copyright 2021-2022 The Connect 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/Makefile b/Makefile
index 54bcf609..35448ee5 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ generate: $(BIN)/buf $(BIN)/protoc-gen-go $(BIN)/protoc-gen-connect-go $(BIN)/li
 	PATH="$(abspath $(BIN))" buf generate
 	license-header \
 		--license-type apache \
-		--copyright-holder "Buf Technologies, Inc." \
+		--copyright-holder "The Connect Authors" \
 		--year-range "$(COPYRIGHT_YEARS)" $(LICENSE_IGNORE)
 
 .PHONY: upgrade
diff --git a/bench_test.go b/bench_test.go
index 70a800cb..9ecc3914 100644
--- a/bench_test.go
+++ b/bench_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/buffer_pool.go b/buffer_pool.go
index 262bc7a4..606b2ab0 100644
--- a/buffer_pool.go
+++ b/buffer_pool.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/client.go b/client.go
index c1179e44..38bb541b 100644
--- a/client.go
+++ b/client.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/client_example_test.go b/client_example_test.go
index 5121285f..56359017 100644
--- a/client_example_test.go
+++ b/client_example_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/client_ext_test.go b/client_ext_test.go
index 40cbabed..cb4dede4 100644
--- a/client_ext_test.go
+++ b/client_ext_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/client_get_fallback_test.go b/client_get_fallback_test.go
index ba8fe0fe..a8076ffd 100644
--- a/client_get_fallback_test.go
+++ b/client_get_fallback_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/client_stream.go b/client_stream.go
index 8f81b33b..60aff987 100644
--- a/client_stream.go
+++ b/client_stream.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/client_stream_test.go b/client_stream_test.go
index 8592751a..431599f6 100644
--- a/client_stream_test.go
+++ b/client_stream_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/cmd/protoc-gen-connect-go/main.go b/cmd/protoc-gen-connect-go/main.go
index 61aeedcd..7f34d87f 100644
--- a/cmd/protoc-gen-connect-go/main.go
+++ b/cmd/protoc-gen-connect-go/main.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/code.go b/code.go
index 0df64b3a..821d5727 100644
--- a/code.go
+++ b/code.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/code_test.go b/code_test.go
index 6c2830d6..a7f44504 100644
--- a/code_test.go
+++ b/code_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/codec.go b/codec.go
index 4a624c59..4809fe3c 100644
--- a/codec.go
+++ b/codec.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/codec_test.go b/codec_test.go
index 8ed5ec4c..94c3a2f4 100644
--- a/codec_test.go
+++ b/codec_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/compression.go b/compression.go
index 3f3a8812..1b640edb 100644
--- a/compression.go
+++ b/compression.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/compression_test.go b/compression_test.go
index 892734d7..5ae53e6b 100644
--- a/compression_test.go
+++ b/compression_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/connect.go b/connect.go
index 2c8cc5bb..eeb95674 100644
--- a/connect.go
+++ b/connect.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/connect_ext_test.go b/connect_ext_test.go
index f6c1ed1d..9e75253e 100644
--- a/connect_ext_test.go
+++ b/connect_ext_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/duplex_http_call.go b/duplex_http_call.go
index 439f55c2..ab1a6db4 100644
--- a/duplex_http_call.go
+++ b/duplex_http_call.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/envelope.go b/envelope.go
index 8f81ab03..5f02acfa 100644
--- a/envelope.go
+++ b/envelope.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/error.go b/error.go
index f25f9ebb..a88e0347 100644
--- a/error.go
+++ b/error.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/error_example_test.go b/error_example_test.go
index 27f9c7cf..28c9ea79 100644
--- a/error_example_test.go
+++ b/error_example_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/error_not_modified_example_test.go b/error_not_modified_example_test.go
index 881a4b45..8c944d6c 100644
--- a/error_not_modified_example_test.go
+++ b/error_not_modified_example_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/error_test.go b/error_test.go
index 90f62ba4..02d6456b 100644
--- a/error_test.go
+++ b/error_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/error_writer.go b/error_writer.go
index 9644715c..81d5bb9f 100644
--- a/error_writer.go
+++ b/error_writer.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/error_writer_example_test.go b/error_writer_example_test.go
index 6a70979c..2da0dc6b 100644
--- a/error_writer_example_test.go
+++ b/error_writer_example_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/example_init_test.go b/example_init_test.go
index 7b9ad0d1..ab7e1563 100644
--- a/example_init_test.go
+++ b/example_init_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/handler.go b/handler.go
index 34caa69e..43bfe973 100644
--- a/handler.go
+++ b/handler.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/handler_example_test.go b/handler_example_test.go
index f5c2c0da..68b57084 100644
--- a/handler_example_test.go
+++ b/handler_example_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/handler_ext_test.go b/handler_ext_test.go
index b3bd7a2a..4aeb78f0 100644
--- a/handler_ext_test.go
+++ b/handler_ext_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/handler_stream.go b/handler_stream.go
index 00e28335..05eae981 100644
--- a/handler_stream.go
+++ b/handler_stream.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/handler_stream_test.go b/handler_stream_test.go
index 70ceef1b..41b7f019 100644
--- a/handler_stream_test.go
+++ b/handler_stream_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/header.go b/header.go
index f827aba2..c751b9ba 100644
--- a/header.go
+++ b/header.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/header_test.go b/header_test.go
index 7ea85242..38bc3d93 100644
--- a/header_test.go
+++ b/header_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/idempotency_level.go b/idempotency_level.go
index 6428d67e..499da264 100644
--- a/idempotency_level.go
+++ b/idempotency_level.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/interceptor.go b/interceptor.go
index 7ffe19d5..26603030 100644
--- a/interceptor.go
+++ b/interceptor.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/interceptor_example_test.go b/interceptor_example_test.go
index 07829cf6..7d7a2542 100644
--- a/interceptor_example_test.go
+++ b/interceptor_example_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/interceptor_ext_test.go b/interceptor_ext_test.go
index 70e46b59..1e87ac82 100644
--- a/interceptor_ext_test.go
+++ b/interceptor_ext_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/assert/assert.go b/internal/assert/assert.go
index 22049d81..b88aaad4 100644
--- a/internal/assert/assert.go
+++ b/internal/assert/assert.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/assert/assert_test.go b/internal/assert/assert_test.go
index 2c8f35a1..28174fd6 100644
--- a/internal/assert/assert_test.go
+++ b/internal/assert/assert_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/gen/connect/collide/v1/collide.pb.go b/internal/gen/connect/collide/v1/collide.pb.go
index fe746380..62749e99 100644
--- a/internal/gen/connect/collide/v1/collide.pb.go
+++ b/internal/gen/connect/collide/v1/collide.pb.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/gen/connect/collide/v1/collidev1connect/collide.connect.go b/internal/gen/connect/collide/v1/collidev1connect/collide.connect.go
index e0ae47ae..20223410 100644
--- a/internal/gen/connect/collide/v1/collidev1connect/collide.connect.go
+++ b/internal/gen/connect/collide/v1/collidev1connect/collide.connect.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/gen/connect/import/v1/import.pb.go b/internal/gen/connect/import/v1/import.pb.go
index eb01f67e..2941b4f3 100644
--- a/internal/gen/connect/import/v1/import.pb.go
+++ b/internal/gen/connect/import/v1/import.pb.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/gen/connect/import/v1/importv1connect/import.connect.go b/internal/gen/connect/import/v1/importv1connect/import.connect.go
index 327c7881..d56d3efa 100644
--- a/internal/gen/connect/import/v1/importv1connect/import.connect.go
+++ b/internal/gen/connect/import/v1/importv1connect/import.connect.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/gen/connect/ping/v1/ping.pb.go b/internal/gen/connect/ping/v1/ping.pb.go
index 080d9a22..03cfe44b 100644
--- a/internal/gen/connect/ping/v1/ping.pb.go
+++ b/internal/gen/connect/ping/v1/ping.pb.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/gen/connect/ping/v1/pingv1connect/ping.connect.go b/internal/gen/connect/ping/v1/pingv1connect/ping.connect.go
index 7a99236c..036539a8 100644
--- a/internal/gen/connect/ping/v1/pingv1connect/ping.connect.go
+++ b/internal/gen/connect/ping/v1/pingv1connect/ping.connect.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/gen/connectext/grpc/status/v1/status.pb.go b/internal/gen/connectext/grpc/status/v1/status.pb.go
index c84a48ba..719c0ff9 100644
--- a/internal/gen/connectext/grpc/status/v1/status.pb.go
+++ b/internal/gen/connectext/grpc/status/v1/status.pb.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/proto/connect/collide/v1/collide.proto b/internal/proto/connect/collide/v1/collide.proto
index e2d163cc..fd9aad95 100644
--- a/internal/proto/connect/collide/v1/collide.proto
+++ b/internal/proto/connect/collide/v1/collide.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/proto/connect/import/v1/import.proto b/internal/proto/connect/import/v1/import.proto
index 32416168..4eefcca1 100644
--- a/internal/proto/connect/import/v1/import.proto
+++ b/internal/proto/connect/import/v1/import.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/proto/connect/ping/v1/ping.proto b/internal/proto/connect/ping/v1/ping.proto
index 724da70a..98682daf 100644
--- a/internal/proto/connect/ping/v1/ping.proto
+++ b/internal/proto/connect/ping/v1/ping.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/internal/proto/connectext/grpc/status/v1/status.proto b/internal/proto/connectext/grpc/status/v1/status.proto
index 4e249435..6535d0a8 100644
--- a/internal/proto/connectext/grpc/status/v1/status.proto
+++ b/internal/proto/connectext/grpc/status/v1/status.proto
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/option.go b/option.go
index f61f7120..1eb8d7c3 100644
--- a/option.go
+++ b/option.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/protobuf_util.go b/protobuf_util.go
index 839a40f0..3e46311a 100644
--- a/protobuf_util.go
+++ b/protobuf_util.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/protobuf_util_test.go b/protobuf_util_test.go
index 62cff425..b83b9003 100644
--- a/protobuf_util_test.go
+++ b/protobuf_util_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/protocol.go b/protocol.go
index a02f24b0..cc6455cd 100644
--- a/protocol.go
+++ b/protocol.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/protocol_connect.go b/protocol_connect.go
index 110666d3..e3c74923 100644
--- a/protocol_connect.go
+++ b/protocol_connect.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/protocol_connect_test.go b/protocol_connect_test.go
index 692183d7..eb5751a4 100644
--- a/protocol_connect_test.go
+++ b/protocol_connect_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/protocol_grpc.go b/protocol_grpc.go
index 8a9d0ada..d3cb0062 100644
--- a/protocol_grpc.go
+++ b/protocol_grpc.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/protocol_grpc_test.go b/protocol_grpc_test.go
index ee4d9fe3..98ffc74d 100644
--- a/protocol_grpc_test.go
+++ b/protocol_grpc_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/protocol_test.go b/protocol_test.go
index 764d647c..2c925ae5 100644
--- a/protocol_test.go
+++ b/protocol_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/recover.go b/recover.go
index 5cda08a9..fc3ca6eb 100644
--- a/recover.go
+++ b/recover.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect 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/recover_ext_test.go b/recover_ext_test.go
index b781db17..e8cb991b 100644
--- a/recover_ext_test.go
+++ b/recover_ext_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2023 The Connect Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.