diff --git a/Dockerfile b/Dockerfile
index e42166793..c90773b9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:experimental
 
 
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI authors
 
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 #   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.
+
 ARG GO_VERSION=1.15.2-alpine
 ARG GOLANGCI_LINT_VERSION=v1.31.0-alpine
 
diff --git a/Makefile b/Makefile
index 6fe3c4124..6eca24821 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/NOTICE b/NOTICE
index 2b3c2776c..265c0a052 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,2 +1,4 @@
 Docker Compose CLI
-Copyright 2020 Docker Inc.
+Copyright 2020 Docker Compose CLI authors
+
+This product includes software developed at Docker, Inc. (https://www.docker.com).
diff --git a/aci/aci.go b/aci/aci.go
index 795a8f493..12442313d 100644
--- a/aci/aci.go
+++ b/aci/aci.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/aci_test.go b/aci/aci_test.go
index 22efe8eab..7ab6fe942 100644
--- a/aci/aci_test.go
+++ b/aci/aci_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/backend.go b/aci/backend.go
index a5890f33f..0aeed8610 100644
--- a/aci/backend.go
+++ b/aci/backend.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/backend_test.go b/aci/backend_test.go
index aafcb52de..96432d903 100644
--- a/aci/backend_test.go
+++ b/aci/backend_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/cloud.go b/aci/cloud.go
index ff761800a..d47c174ac 100644
--- a/aci/cloud.go
+++ b/aci/cloud.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/compose.go b/aci/compose.go
index fe6a3e1eb..ca57ef3ef 100644
--- a/aci/compose.go
+++ b/aci/compose.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/containers.go b/aci/containers.go
index 61c50b656..608a52350 100644
--- a/aci/containers.go
+++ b/aci/containers.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/context.go b/aci/context.go
index 3ca254697..564ec3a2c 100644
--- a/aci/context.go
+++ b/aci/context.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/context_test.go b/aci/context_test.go
index 0453158cb..e834498a2 100644
--- a/aci/context_test.go
+++ b/aci/context_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/container.go b/aci/convert/container.go
index 3cff17c42..f2cbc3ba5 100644
--- a/aci/convert/container.go
+++ b/aci/convert/container.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/container_test.go b/aci/convert/container_test.go
index 1f9efba0b..1fd0a7f0e 100644
--- a/aci/convert/container_test.go
+++ b/aci/convert/container_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/convert.go b/aci/convert/convert.go
index 17d3ad6c8..aafcca92c 100644
--- a/aci/convert/convert.go
+++ b/aci/convert/convert.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/convert_test.go b/aci/convert/convert_test.go
index d6c656dd6..ec6e6135d 100644
--- a/aci/convert/convert_test.go
+++ b/aci/convert/convert_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/ports.go b/aci/convert/ports.go
index 336596a3e..55ceacb5c 100644
--- a/aci/convert/ports.go
+++ b/aci/convert/ports.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/ports_test.go b/aci/convert/ports_test.go
index f9b9a378e..6c1dea9e6 100644
--- a/aci/convert/ports_test.go
+++ b/aci/convert/ports_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/registry_credentials.go b/aci/convert/registry_credentials.go
index ee7835894..e2fa66e76 100644
--- a/aci/convert/registry_credentials.go
+++ b/aci/convert/registry_credentials.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/registry_credentials_test.go b/aci/convert/registry_credentials_test.go
index be482aeb7..890776632 100644
--- a/aci/convert/registry_credentials_test.go
+++ b/aci/convert/registry_credentials_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/volume.go b/aci/convert/volume.go
index 171741a46..5079d1253 100644
--- a/aci/convert/volume.go
+++ b/aci/convert/volume.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/convert/volume_test.go b/aci/convert/volume_test.go
index f283891fe..7d66b6c30 100644
--- a/aci/convert/volume_test.go
+++ b/aci/convert/volume_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/login/client.go b/aci/login/client.go
index 7de5d327e..da827b623 100644
--- a/aci/login/client.go
+++ b/aci/login/client.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/login/helper.go b/aci/login/helper.go
index 8e7a00418..5242f5b59 100644
--- a/aci/login/helper.go
+++ b/aci/login/helper.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/login/local_server.go b/aci/login/local_server.go
index 1287e9ac7..f65fa3e04 100644
--- a/aci/login/local_server.go
+++ b/aci/login/local_server.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/login/login.go b/aci/login/login.go
index da9474265..05e297ae8 100644
--- a/aci/login/login.go
+++ b/aci/login/login.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/login/login_test.go b/aci/login/login_test.go
index e57f6e4a5..12330fe93 100644
--- a/aci/login/login_test.go
+++ b/aci/login/login_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/login/storagelogin.go b/aci/login/storagelogin.go
index 13a3923f1..7a3153cb7 100644
--- a/aci/login/storagelogin.go
+++ b/aci/login/storagelogin.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/login/token_store.go b/aci/login/token_store.go
index 925ee7015..337e9b931 100644
--- a/aci/login/token_store.go
+++ b/aci/login/token_store.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/login/token_store_test.go b/aci/login/token_store_test.go
index b6d05724c..4eef8d769 100644
--- a/aci/login/token_store_test.go
+++ b/aci/login/token_store_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/resource_group.go b/aci/resource_group.go
index 6340ba03e..07513c6c5 100644
--- a/aci/resource_group.go
+++ b/aci/resource_group.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/aci/volumes.go b/aci/volumes.go
index 63fe553f1..a07af69f7 100644
--- a/aci/volumes.go
+++ b/aci/volumes.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/client/client.go b/api/client/client.go
index fc7c1c277..a35c0b74d 100644
--- a/api/client/client.go
+++ b/api/client/client.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/client/compose.go b/api/client/compose.go
index 91387f24a..548caad4f 100644
--- a/api/client/compose.go
+++ b/api/client/compose.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/client/containers.go b/api/client/containers.go
index 41639f382..efa395372 100644
--- a/api/client/containers.go
+++ b/api/client/containers.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/client/secrets.go b/api/client/secrets.go
index 24a754b11..8c2debd23 100644
--- a/api/client/secrets.go
+++ b/api/client/secrets.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/client/volume.go b/api/client/volume.go
index 58c89ed8a..14053573e 100644
--- a/api/client/volume.go
+++ b/api/client/volume.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/compose/api.go b/api/compose/api.go
index 98ed050e0..e37e65a9a 100644
--- a/api/compose/api.go
+++ b/api/compose/api.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/compose/tags.go b/api/compose/tags.go
index 300e55bbf..9e6263daa 100644
--- a/api/compose/tags.go
+++ b/api/compose/tags.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/containers/api.go b/api/containers/api.go
index 8efbb4a1f..0185f80b7 100644
--- a/api/containers/api.go
+++ b/api/containers/api.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/secrets/api.go b/api/secrets/api.go
index 53fafe96c..681bed62b 100644
--- a/api/secrets/api.go
+++ b/api/secrets/api.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/api/volumes/api.go b/api/volumes/api.go
index a753fcea9..33238b69d 100644
--- a/api/volumes/api.go
+++ b/api/volumes/api.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/backend/backend.go b/backend/backend.go
index dc7562617..f42df393f 100644
--- a/backend/backend.go
+++ b/backend/backend.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/builder.Makefile b/builder.Makefile
index 24d869968..28e5d3953 100644
--- a/builder.Makefile
+++ b/builder.Makefile
@@ -1,4 +1,4 @@
-#   Copyright 2020 The 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/cli/cmd/compose/compose.go b/cli/cmd/compose/compose.go
index 83c89cde2..e58243d64 100644
--- a/cli/cmd/compose/compose.go
+++ b/cli/cmd/compose/compose.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/compose/convert.go b/cli/cmd/compose/convert.go
index 7a0360c60..224256d7a 100644
--- a/cli/cmd/compose/convert.go
+++ b/cli/cmd/compose/convert.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/compose/down.go b/cli/cmd/compose/down.go
index 0b01155b2..3519d394e 100644
--- a/cli/cmd/compose/down.go
+++ b/cli/cmd/compose/down.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/compose/list.go b/cli/cmd/compose/list.go
index 03346f59f..d44e05bb5 100644
--- a/cli/cmd/compose/list.go
+++ b/cli/cmd/compose/list.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/compose/logs.go b/cli/cmd/compose/logs.go
index e8e83ceef..4f08f3aad 100644
--- a/cli/cmd/compose/logs.go
+++ b/cli/cmd/compose/logs.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/compose/ps.go b/cli/cmd/compose/ps.go
index 038f03123..8ad400554 100644
--- a/cli/cmd/compose/ps.go
+++ b/cli/cmd/compose/ps.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/compose/up.go b/cli/cmd/compose/up.go
index c3e618c3e..3c5ec616f 100644
--- a/cli/cmd/compose/up.go
+++ b/cli/cmd/compose/up.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/context/context.go b/cli/cmd/context/context.go
index a8bb3144d..3c90fc2ee 100644
--- a/cli/cmd/context/context.go
+++ b/cli/cmd/context/context.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/context/create.go b/cli/cmd/context/create.go
index e1ebdba1f..b678a2973 100644
--- a/cli/cmd/context/create.go
+++ b/cli/cmd/context/create.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/context/create_aci.go b/cli/cmd/context/create_aci.go
index aeef3e2ff..c66787df8 100644
--- a/cli/cmd/context/create_aci.go
+++ b/cli/cmd/context/create_aci.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/context/create_ecs.go b/cli/cmd/context/create_ecs.go
index 78fb62663..48c7b6800 100644
--- a/cli/cmd/context/create_ecs.go
+++ b/cli/cmd/context/create_ecs.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/context/inspect.go b/cli/cmd/context/inspect.go
index 4e7ce4856..c2550ca75 100644
--- a/cli/cmd/context/inspect.go
+++ b/cli/cmd/context/inspect.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/context/ls.go b/cli/cmd/context/ls.go
index 0c7d43665..2cad5c7ba 100644
--- a/cli/cmd/context/ls.go
+++ b/cli/cmd/context/ls.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/context/rm.go b/cli/cmd/context/rm.go
index 9a699996e..1a0c2616c 100644
--- a/cli/cmd/context/rm.go
+++ b/cli/cmd/context/rm.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/context/show.go b/cli/cmd/context/show.go
index a12aa3076..5b6c21298 100644
--- a/cli/cmd/context/show.go
+++ b/cli/cmd/context/show.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/context/use.go b/cli/cmd/context/use.go
index b972e7628..d58c2d99d 100644
--- a/cli/cmd/context/use.go
+++ b/cli/cmd/context/use.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/ecs.go b/cli/cmd/ecs.go
index 77b35973c..d5b2d9722 100644
--- a/cli/cmd/ecs.go
+++ b/cli/cmd/ecs.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/exec.go b/cli/cmd/exec.go
index 7d09f2dd7..5901e83f8 100644
--- a/cli/cmd/exec.go
+++ b/cli/cmd/exec.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/inspect.go b/cli/cmd/inspect.go
index 7ffe50da6..20997d869 100644
--- a/cli/cmd/inspect.go
+++ b/cli/cmd/inspect.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/inspect_test.go b/cli/cmd/inspect_test.go
index 20acff972..af75d4dfc 100644
--- a/cli/cmd/inspect_test.go
+++ b/cli/cmd/inspect_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/kill.go b/cli/cmd/kill.go
index c63a9cdac..9b14f7fec 100644
--- a/cli/cmd/kill.go
+++ b/cli/cmd/kill.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/login/azurelogin.go b/cli/cmd/login/azurelogin.go
index e05933ba4..fd90170c5 100644
--- a/cli/cmd/login/azurelogin.go
+++ b/cli/cmd/login/azurelogin.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/login/login.go b/cli/cmd/login/login.go
index f9a6247d8..0b2ae2e94 100644
--- a/cli/cmd/login/login.go
+++ b/cli/cmd/login/login.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/logout/azure.go b/cli/cmd/logout/azure.go
index 44d305c94..1f0ca0390 100644
--- a/cli/cmd/logout/azure.go
+++ b/cli/cmd/logout/azure.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/logout/logout.go b/cli/cmd/logout/logout.go
index 8a92e1b51..621f75036 100644
--- a/cli/cmd/logout/logout.go
+++ b/cli/cmd/logout/logout.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/logs.go b/cli/cmd/logs.go
index dc478f4ee..2b09cc161 100644
--- a/cli/cmd/logs.go
+++ b/cli/cmd/logs.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/mobyflags/mobyflags.go b/cli/cmd/mobyflags/mobyflags.go
index e6c7bcf1a..c116ec28f 100644
--- a/cli/cmd/mobyflags/mobyflags.go
+++ b/cli/cmd/mobyflags/mobyflags.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/ps.go b/cli/cmd/ps.go
index b918b6cd2..ea55862f1 100644
--- a/cli/cmd/ps.go
+++ b/cli/cmd/ps.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/ps_test.go b/cli/cmd/ps_test.go
index f303ad21a..7dc72d57c 100644
--- a/cli/cmd/ps_test.go
+++ b/cli/cmd/ps_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/rm.go b/cli/cmd/rm.go
index 500ffc9ac..5a8245131 100644
--- a/cli/cmd/rm.go
+++ b/cli/cmd/rm.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/run/run.go b/cli/cmd/run/run.go
index 194ba0783..350b7e146 100644
--- a/cli/cmd/run/run.go
+++ b/cli/cmd/run/run.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/run/run_test.go b/cli/cmd/run/run_test.go
index f75aea2b9..b781179e0 100644
--- a/cli/cmd/run/run_test.go
+++ b/cli/cmd/run/run_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/secrets.go b/cli/cmd/secrets.go
index 539fef93e..cce9141f4 100644
--- a/cli/cmd/secrets.go
+++ b/cli/cmd/secrets.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/secrets_test.go b/cli/cmd/secrets_test.go
index 709681365..9624c0c5d 100644
--- a/cli/cmd/secrets_test.go
+++ b/cli/cmd/secrets_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/serve.go b/cli/cmd/serve.go
index 81f989724..f3aa6c0c7 100644
--- a/cli/cmd/serve.go
+++ b/cli/cmd/serve.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/start.go b/cli/cmd/start.go
index e973c817d..14fb009d0 100644
--- a/cli/cmd/start.go
+++ b/cli/cmd/start.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/stop.go b/cli/cmd/stop.go
index 9c3cd122e..219c8e728 100644
--- a/cli/cmd/stop.go
+++ b/cli/cmd/stop.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/version.go b/cli/cmd/version.go
index 3075970c2..70a7cd0ad 100644
--- a/cli/cmd/version.go
+++ b/cli/cmd/version.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/volume/acivolume.go b/cli/cmd/volume/acivolume.go
index f15e4256f..bf6470e2c 100644
--- a/cli/cmd/volume/acivolume.go
+++ b/cli/cmd/volume/acivolume.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/volume/list.go b/cli/cmd/volume/list.go
index bca775960..9ab3313ac 100644
--- a/cli/cmd/volume/list.go
+++ b/cli/cmd/volume/list.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/cmd/volume/list_test.go b/cli/cmd/volume/list_test.go
index f981f0d76..f88716e90 100644
--- a/cli/cmd/volume/list_test.go
+++ b/cli/cmd/volume/list_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/config/flags.go b/cli/config/flags.go
index 31eb3187d..2ba12e677 100644
--- a/cli/config/flags.go
+++ b/cli/config/flags.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/formatter/multierrformat.go b/cli/formatter/multierrformat.go
index a91f1cc3b..28d538f56 100644
--- a/cli/formatter/multierrformat.go
+++ b/cli/formatter/multierrformat.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/main.go b/cli/main.go
index 83961575b..56abe671f 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/main_test.go b/cli/main_test.go
index c116a18cf..f634b4672 100644
--- a/cli/main_test.go
+++ b/cli/main_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/mobycli/exec.go b/cli/mobycli/exec.go
index 99a832a9c..4b1f6a21a 100644
--- a/cli/mobycli/exec.go
+++ b/cli/mobycli/exec.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/mobycli/exec_test.go b/cli/mobycli/exec_test.go
index 5bfb533e6..20bd71faf 100644
--- a/cli/mobycli/exec_test.go
+++ b/cli/mobycli/exec_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/mobycli/job_windows.go b/cli/mobycli/job_windows.go
index 8006ba9d1..39f93916e 100644
--- a/cli/mobycli/job_windows.go
+++ b/cli/mobycli/job_windows.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/options/options.go b/cli/options/options.go
index 13a2b461b..f75754383 100644
--- a/cli/options/options.go
+++ b/cli/options/options.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/options/run/opts.go b/cli/options/run/opts.go
index 91e68451b..8694aa418 100644
--- a/cli/options/run/opts.go
+++ b/cli/options/run/opts.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/cli/options/run/opts_test.go b/cli/options/run/opts_test.go
index acf41c86c..04a4c8ea1 100644
--- a/cli/options/run/opts_test.go
+++ b/cli/options/run/opts_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/config/config.go b/config/config.go
index 0241348fb..1ea0e43b5 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/config/config_test.go b/config/config_test.go
index b161887a3..3986c6f0b 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/config/keys.go b/config/keys.go
index c22f0fb27..5ecbf3a36 100644
--- a/config/keys.go
+++ b/config/keys.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/context/cloud/api.go b/context/cloud/api.go
index 5dc8b0e38..475599d39 100644
--- a/context/cloud/api.go
+++ b/context/cloud/api.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/context/context.go b/context/context.go
index b800aad2a..b1138c31f 100644
--- a/context/context.go
+++ b/context/context.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/context/flags.go b/context/flags.go
index 8fff75119..ab545d3a5 100644
--- a/context/flags.go
+++ b/context/flags.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/context/store/contextmetadata.go b/context/store/contextmetadata.go
index b6138e583..771c074d3 100644
--- a/context/store/contextmetadata.go
+++ b/context/store/contextmetadata.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/context/store/contextmetadata_test.go b/context/store/contextmetadata_test.go
index ed4b0eec5..951695487 100644
--- a/context/store/contextmetadata_test.go
+++ b/context/store/contextmetadata_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/context/store/store.go b/context/store/store.go
index 1294f5c78..917f282ec 100644
--- a/context/store/store.go
+++ b/context/store/store.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/context/store/store_test.go b/context/store/store_test.go
index c4fa70d3c..29b814f18 100644
--- a/context/store/store_test.go
+++ b/context/store/store_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/context/store/storedefault.go b/context/store/storedefault.go
index 8b797c8f9..1cfa8d57f 100644
--- a/context/store/storedefault.go
+++ b/context/store/storedefault.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/docs/install/install.sh b/docs/install/install.sh
index aa6800372..00b767bfe 100755
--- a/docs/install/install.sh
+++ b/docs/install/install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/ecs/backend.go b/ecs/backend.go
index 7f7f269fb..42e48bf46 100644
--- a/ecs/backend.go
+++ b/ecs/backend.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/cloudformation.go b/ecs/cloudformation.go
index 78d681288..0dc489768 100644
--- a/ecs/cloudformation.go
+++ b/ecs/cloudformation.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/cloudformation_test.go b/ecs/cloudformation_test.go
index d3b457e40..fd2f087d4 100644
--- a/ecs/cloudformation_test.go
+++ b/ecs/cloudformation_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/colors.go b/ecs/colors.go
index 1486e1381..a08bc9172 100644
--- a/ecs/colors.go
+++ b/ecs/colors.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/compatibility.go b/ecs/compatibility.go
index 2f634840d..f22694516 100644
--- a/ecs/compatibility.go
+++ b/ecs/compatibility.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/context.go b/ecs/context.go
index b82f96ff6..65096ea8d 100644
--- a/ecs/context.go
+++ b/ecs/context.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/convert.go b/ecs/convert.go
index 272eb6052..ca32d00f0 100644
--- a/ecs/convert.go
+++ b/ecs/convert.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/doc.go b/ecs/doc.go
index 74f8b51d2..4fe32bd60 100644
--- a/ecs/doc.go
+++ b/ecs/doc.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/down.go b/ecs/down.go
index 782be5db5..914f680db 100644
--- a/ecs/down.go
+++ b/ecs/down.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/gpu.go b/ecs/gpu.go
index 16fa412f5..c4427d440 100644
--- a/ecs/gpu.go
+++ b/ecs/gpu.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/gpu_test.go b/ecs/gpu_test.go
index d556e22f9..c4705e0c0 100644
--- a/ecs/gpu_test.go
+++ b/ecs/gpu_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/iam.go b/ecs/iam.go
index 7a4510ea5..b91ad6bb7 100644
--- a/ecs/iam.go
+++ b/ecs/iam.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/list.go b/ecs/list.go
index 48873cd88..b80eade4b 100644
--- a/ecs/list.go
+++ b/ecs/list.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/local/backend.go b/ecs/local/backend.go
index 2f7935882..f2a789626 100644
--- a/ecs/local/backend.go
+++ b/ecs/local/backend.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/local/compose.go b/ecs/local/compose.go
index 016028338..b84a3d423 100644
--- a/ecs/local/compose.go
+++ b/ecs/local/compose.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/local/context.go b/ecs/local/context.go
index e2a93c9f8..ebd71c22e 100644
--- a/ecs/local/context.go
+++ b/ecs/local/context.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/logs.go b/ecs/logs.go
index e55dc2bc7..c7a8c55d4 100644
--- a/ecs/logs.go
+++ b/ecs/logs.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/marshall.go b/ecs/marshall.go
index d595e7c55..f37654e95 100644
--- a/ecs/marshall.go
+++ b/ecs/marshall.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/ps.go b/ecs/ps.go
index eee44a93f..318326c41 100644
--- a/ecs/ps.go
+++ b/ecs/ps.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/sdk.go b/ecs/sdk.go
index 0df32f4c7..9b7db23f8 100644
--- a/ecs/sdk.go
+++ b/ecs/sdk.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/secrets.go b/ecs/secrets.go
index 662b10c96..b72325ec8 100644
--- a/ecs/secrets.go
+++ b/ecs/secrets.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/secrets/Dockerfile b/ecs/secrets/Dockerfile
index 48d1203dc..c41e0d071 100644
--- a/ecs/secrets/Dockerfile
+++ b/ecs/secrets/Dockerfile
@@ -1,4 +1,4 @@
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/ecs/secrets/init.go b/ecs/secrets/init.go
index 729afe104..dd0c58749 100644
--- a/ecs/secrets/init.go
+++ b/ecs/secrets/init.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/secrets/init_test.go b/ecs/secrets/init_test.go
index 5389a5c5c..57623a9bd 100644
--- a/ecs/secrets/init_test.go
+++ b/ecs/secrets/init_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/secrets/main/main.go b/ecs/secrets/main/main.go
index 733ad0545..e8eebd55f 100644
--- a/ecs/secrets/main/main.go
+++ b/ecs/secrets/main/main.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/up.go b/ecs/up.go
index 0bebd7451..93ee67883 100644
--- a/ecs/up.go
+++ b/ecs/up.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/wait.go b/ecs/wait.go
index 9346ae4f5..27ccef4b9 100644
--- a/ecs/wait.go
+++ b/ecs/wait.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/ecs/x.go b/ecs/x.go
index 5fdeeab2f..4f417dcd6 100644
--- a/ecs/x.go
+++ b/ecs/x.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/errdefs/errors.go b/errdefs/errors.go
index 159be0bcf..44bd93646 100644
--- a/errdefs/errors.go
+++ b/errdefs/errors.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/errdefs/errors_test.go b/errdefs/errors_test.go
index 2760adc18..5d9253c41 100644
--- a/errdefs/errors_test.go
+++ b/errdefs/errors_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/backend.go b/example/backend.go
index 23775841c..872a884a4 100644
--- a/example/backend.go
+++ b/example/backend.go
@@ -1,7 +1,7 @@
 // +build example
 
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/doc.go b/example/doc.go
index 77f28fe56..a1aa20c86 100644
--- a/example/doc.go
+++ b/example/doc.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/formatter/json.go b/formatter/json.go
index be17401b8..bb9b6078b 100644
--- a/formatter/json.go
+++ b/formatter/json.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/formatter/units.go b/formatter/units.go
index c1795fd41..d26902cdb 100644
--- a/formatter/units.go
+++ b/formatter/units.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/formatter/units_test.go b/formatter/units_test.go
index 2c9a22ada..ea21a2108 100644
--- a/formatter/units_test.go
+++ b/formatter/units_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/local/backend.go b/local/backend.go
index dfd8f6d4b..c616715b6 100644
--- a/local/backend.go
+++ b/local/backend.go
@@ -1,7 +1,7 @@
 // +build local
 
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/local/doc.go b/local/doc.go
index cd1e3c43b..81aae393e 100644
--- a/local/doc.go
+++ b/local/doc.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/local/e2e/backend_test.go b/local/e2e/backend_test.go
index e40b88855..8922257a0 100644
--- a/local/e2e/backend_test.go
+++ b/local/e2e/backend_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/metrics/client.go b/metrics/client.go
index 509599a16..d19f8762c 100644
--- a/metrics/client.go
+++ b/metrics/client.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/metrics/conn_other.go b/metrics/conn_other.go
index eb47f1565..a648eebc8 100644
--- a/metrics/conn_other.go
+++ b/metrics/conn_other.go
@@ -1,7 +1,7 @@
 // +build !windows
 
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/metrics/conn_windows.go b/metrics/conn_windows.go
index 5d414f54c..be967a32c 100644
--- a/metrics/conn_windows.go
+++ b/metrics/conn_windows.go
@@ -1,7 +1,7 @@
 // +build windows
 
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/metrics/metrics.go b/metrics/metrics.go
index 9ab3d1db3..7de8a2bb7 100644
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/metrics/metrics_test.go b/metrics/metrics_test.go
index e4cee60b0..d2fbc236b 100644
--- a/metrics/metrics_test.go
+++ b/metrics/metrics_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/progress/plain.go b/progress/plain.go
index 1cbfa2f4d..3280bee1f 100644
--- a/progress/plain.go
+++ b/progress/plain.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/progress/spinner.go b/progress/spinner.go
index 38835287f..3e757acf4 100644
--- a/progress/spinner.go
+++ b/progress/spinner.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/progress/tty.go b/progress/tty.go
index 4dd9dee51..1da062aed 100644
--- a/progress/tty.go
+++ b/progress/tty.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/progress/tty_test.go b/progress/tty_test.go
index 578a3f414..51dc6f612 100644
--- a/progress/tty_test.go
+++ b/progress/tty_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/progress/writer.go b/progress/writer.go
index 5ca0e3e21..e46f90172 100644
--- a/progress/writer.go
+++ b/progress/writer.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/prompt/prompt.go b/prompt/prompt.go
index d23904cc2..395c327ca 100644
--- a/prompt/prompt.go
+++ b/prompt/prompt.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/protos/compose/v1/compose.pb.go b/protos/compose/v1/compose.pb.go
index 4bd488c83..595d0fd9a 100644
--- a/protos/compose/v1/compose.pb.go
+++ b/protos/compose/v1/compose.pb.go
@@ -1,5 +1,5 @@
 //
-//  Copyright 2020 Docker, Inc.
+//  Copyright 2020 Docker Compose CLI 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/protos/compose/v1/compose.proto b/protos/compose/v1/compose.proto
index 5f7c5cf23..fbe9a31b4 100644
--- a/protos/compose/v1/compose.proto
+++ b/protos/compose/v1/compose.proto
@@ -1,5 +1,5 @@
 //
-//  Copyright 2020 Docker, Inc.
+//  Copyright 2020 Docker Compose CLI 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/protos/compose/v1/doc.go b/protos/compose/v1/doc.go
index bb3caa81a..b0664bbbf 100644
--- a/protos/compose/v1/doc.go
+++ b/protos/compose/v1/doc.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/protos/containers/v1/containers.pb.go b/protos/containers/v1/containers.pb.go
index f84f8b199..aa4940be5 100644
--- a/protos/containers/v1/containers.pb.go
+++ b/protos/containers/v1/containers.pb.go
@@ -1,5 +1,5 @@
 //
-//  Copyright 2020 Docker, Inc.
+//  Copyright 2020 Docker Compose CLI 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/protos/containers/v1/containers.proto b/protos/containers/v1/containers.proto
index f925aa54b..c2cb2f146 100644
--- a/protos/containers/v1/containers.proto
+++ b/protos/containers/v1/containers.proto
@@ -1,5 +1,5 @@
 //
-//  Copyright 2020 Docker, Inc.
+//  Copyright 2020 Docker Compose CLI 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/protos/containers/v1/doc.go b/protos/containers/v1/doc.go
index bb3caa81a..b0664bbbf 100644
--- a/protos/containers/v1/doc.go
+++ b/protos/containers/v1/doc.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/protos/contexts/v1/contexts.pb.go b/protos/contexts/v1/contexts.pb.go
index ec8845718..3cb388e7b 100644
--- a/protos/contexts/v1/contexts.pb.go
+++ b/protos/contexts/v1/contexts.pb.go
@@ -1,5 +1,5 @@
 //
-//  Copyright 2020 Docker, Inc.
+//  Copyright 2020 Docker Compose CLI 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/protos/contexts/v1/contexts.proto b/protos/contexts/v1/contexts.proto
index c18d828d7..73aed7b9e 100644
--- a/protos/contexts/v1/contexts.proto
+++ b/protos/contexts/v1/contexts.proto
@@ -1,5 +1,5 @@
 //
-//  Copyright 2020 Docker, Inc.
+//  Copyright 2020 Docker Compose CLI 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/protos/contexts/v1/doc.go b/protos/contexts/v1/doc.go
index bb3caa81a..b0664bbbf 100644
--- a/protos/contexts/v1/doc.go
+++ b/protos/contexts/v1/doc.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/protos/streams/v1/streams.pb.go b/protos/streams/v1/streams.pb.go
index 2097e20a8..f9c54bb16 100644
--- a/protos/streams/v1/streams.pb.go
+++ b/protos/streams/v1/streams.pb.go
@@ -1,5 +1,5 @@
 //
-//  Copyright 2020 Docker, Inc.
+//  Copyright 2020 Docker Compose CLI 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/protos/streams/v1/streams.proto b/protos/streams/v1/streams.proto
index 64ab8dbb9..8d3961188 100644
--- a/protos/streams/v1/streams.proto
+++ b/protos/streams/v1/streams.proto
@@ -1,5 +1,5 @@
 //
-//  Copyright 2020 Docker, Inc.
+//  Copyright 2020 Docker Compose CLI 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/scripts/install/install_linux.sh b/scripts/install/install_linux.sh
index e11e7a0c3..1e6cee321 100644
--- a/scripts/install/install_linux.sh
+++ b/scripts/install/install_linux.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/scripts/validate/check-go-mod b/scripts/validate/check-go-mod
index 20eeef1b5..ad45b563b 100755
--- a/scripts/validate/check-go-mod
+++ b/scripts/validate/check-go-mod
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#   Copyright The Compose Specification Authors.
+#   Copyright Docker Compose CLI 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/scripts/validate/fileheader b/scripts/validate/fileheader
index 5f07a6cd2..b77b5a69f 100755
--- a/scripts/validate/fileheader
+++ b/scripts/validate/fileheader
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-#   Copyright The Compose Specification Authors.
+#   Copyright Docker Compose CLI authors
 
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-
 set -eu -o pipefail
 
 if ! command -v ltag; then
diff --git a/scripts/validate/template/bash.txt b/scripts/validate/template/bash.txt
index 6d89e6173..31e00001c 100644
--- a/scripts/validate/template/bash.txt
+++ b/scripts/validate/template/bash.txt
@@ -1,4 +1,4 @@
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/scripts/validate/template/dockerfile.txt b/scripts/validate/template/dockerfile.txt
index 6d89e6173..31e00001c 100644
--- a/scripts/validate/template/dockerfile.txt
+++ b/scripts/validate/template/dockerfile.txt
@@ -1,4 +1,4 @@
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/scripts/validate/template/go.txt b/scripts/validate/template/go.txt
index 1cd855449..a3ee08615 100644
--- a/scripts/validate/template/go.txt
+++ b/scripts/validate/template/go.txt
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/scripts/validate/template/makefile.txt b/scripts/validate/template/makefile.txt
index 6d89e6173..31e00001c 100644
--- a/scripts/validate/template/makefile.txt
+++ b/scripts/validate/template/makefile.txt
@@ -1,4 +1,4 @@
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/server/contextserverstream.go b/server/contextserverstream.go
index becdcb8f1..d3f31520e 100644
--- a/server/contextserverstream.go
+++ b/server/contextserverstream.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/interceptor.go b/server/interceptor.go
index b4f449487..41072b344 100644
--- a/server/interceptor.go
+++ b/server/interceptor.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/interceptor_test.go b/server/interceptor_test.go
index 099b0dc5e..88fa1ae28 100644
--- a/server/interceptor_test.go
+++ b/server/interceptor_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/metrics.go b/server/metrics.go
index cf8edc891..9c5c64f41 100644
--- a/server/metrics.go
+++ b/server/metrics.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/metrics_test.go b/server/metrics_test.go
index 002aa2c49..ad061e15b 100644
--- a/server/metrics_test.go
+++ b/server/metrics_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/containers.go b/server/proxy/containers.go
index 1962be0bf..ff3e0962e 100644
--- a/server/proxy/containers.go
+++ b/server/proxy/containers.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/containers_test.go b/server/proxy/containers_test.go
index 035778544..2fa0f84b8 100644
--- a/server/proxy/containers_test.go
+++ b/server/proxy/containers_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/contexts.go b/server/proxy/contexts.go
index 60bace74a..b7ec4e2c1 100644
--- a/server/proxy/contexts.go
+++ b/server/proxy/contexts.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/proxy.go b/server/proxy/proxy.go
index 4029f37c1..7a9f0f4e0 100644
--- a/server/proxy/proxy.go
+++ b/server/proxy/proxy.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/streams.go b/server/proxy/streams.go
index eccdb388f..edd1690c1 100644
--- a/server/proxy/streams.go
+++ b/server/proxy/streams.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/streams/io.go b/server/proxy/streams/io.go
index d9adc8a07..b7e294622 100644
--- a/server/proxy/streams/io.go
+++ b/server/proxy/streams/io.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/streams/logs.go b/server/proxy/streams/logs.go
index 84cc7f510..58a948516 100644
--- a/server/proxy/streams/logs.go
+++ b/server/proxy/streams/logs.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/streams/logs_test.go b/server/proxy/streams/logs_test.go
index bd91f858a..46a59e15e 100644
--- a/server/proxy/streams/logs_test.go
+++ b/server/proxy/streams/logs_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/streams/stream.go b/server/proxy/streams/stream.go
index f0eb0a930..79d07b963 100644
--- a/server/proxy/streams/stream.go
+++ b/server/proxy/streams/stream.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/proxy/streams/stream_test.go b/server/proxy/streams/stream_test.go
index 15055af86..1bc22aa26 100644
--- a/server/proxy/streams/stream_test.go
+++ b/server/proxy/streams/stream_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/server.go b/server/server.go
index 7d7380299..0842afe8f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/socket_unix.go b/server/socket_unix.go
index 288cbb936..5e597d06b 100644
--- a/server/socket_unix.go
+++ b/server/socket_unix.go
@@ -1,7 +1,7 @@
 // +build !windows
 
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/server/socket_windows.go b/server/socket_windows.go
index 277f81157..cf95f4022 100644
--- a/server/socket_windows.go
+++ b/server/socket_windows.go
@@ -1,7 +1,7 @@
 // +build windows
 
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/tests/aci-e2e/e2e-aci_test.go b/tests/aci-e2e/e2e-aci_test.go
index e697d9f63..b4082661a 100644
--- a/tests/aci-e2e/e2e-aci_test.go
+++ b/tests/aci-e2e/e2e-aci_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/tests/composefiles/aci-demo/db/Dockerfile b/tests/composefiles/aci-demo/db/Dockerfile
index 693541387..4065c93b3 100644
--- a/tests/composefiles/aci-demo/db/Dockerfile
+++ b/tests/composefiles/aci-demo/db/Dockerfile
@@ -1,4 +1,4 @@
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/tests/composefiles/aci-demo/web/Dockerfile b/tests/composefiles/aci-demo/web/Dockerfile
index 47ed36860..ce8f6679b 100644
--- a/tests/composefiles/aci-demo/web/Dockerfile
+++ b/tests/composefiles/aci-demo/web/Dockerfile
@@ -1,4 +1,4 @@
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/tests/composefiles/aci-demo/web/dispatcher.go b/tests/composefiles/aci-demo/web/dispatcher.go
index f4653965a..c69ae7c2d 100644
--- a/tests/composefiles/aci-demo/web/dispatcher.go
+++ b/tests/composefiles/aci-demo/web/dispatcher.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/tests/composefiles/aci-demo/words/Dockerfile b/tests/composefiles/aci-demo/words/Dockerfile
index f2c7652c5..2b32e55d0 100644
--- a/tests/composefiles/aci-demo/words/Dockerfile
+++ b/tests/composefiles/aci-demo/words/Dockerfile
@@ -1,4 +1,4 @@
-#   Copyright 2020 Docker, Inc.
+#   Copyright 2020 Docker Compose CLI 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/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index e2b368876..7675c07f9 100644
--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/tests/ecs-e2e/e2e-ecs_test.go b/tests/ecs-e2e/e2e-ecs_test.go
index b0438d721..60393cd67 100644
--- a/tests/ecs-e2e/e2e-ecs_test.go
+++ b/tests/ecs-e2e/e2e-ecs_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/tests/ecs-local-e2e/context_test.go b/tests/ecs-local-e2e/context_test.go
index 4d0003ae0..08c68b290 100644
--- a/tests/ecs-local-e2e/context_test.go
+++ b/tests/ecs-local-e2e/context_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/tests/framework/e2e.go b/tests/framework/e2e.go
index 80daa8737..1e79c18ce 100644
--- a/tests/framework/e2e.go
+++ b/tests/framework/e2e.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/tests/framework/unit.go b/tests/framework/unit.go
index 3d00eb8eb..d2c8dc140 100644
--- a/tests/framework/unit.go
+++ b/tests/framework/unit.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/tests/skip-win-ci-e2e/skip_win_ci_test.go b/tests/skip-win-ci-e2e/skip_win_ci_test.go
index d9f4397b1..4cfbb4e98 100644
--- a/tests/skip-win-ci-e2e/skip_win_ci_test.go
+++ b/tests/skip-win-ci-e2e/skip_win_ci_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/utils/formatter/container.go b/utils/formatter/container.go
index 197a760ec..4ed7a3854 100644
--- a/utils/formatter/container.go
+++ b/utils/formatter/container.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/utils/formatter/container_test.go b/utils/formatter/container_test.go
index 771c497bf..dcfaf8106 100644
--- a/utils/formatter/container_test.go
+++ b/utils/formatter/container_test.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI 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/utils/stringutils.go b/utils/stringutils.go
index d02a3a874..fd2dd477d 100644
--- a/utils/stringutils.go
+++ b/utils/stringutils.go
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020 Docker, Inc.
+   Copyright 2020 Docker Compose CLI authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.