diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56fda53..313cb6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 cmake_minimum_required(VERSION 3.5)
diff --git a/bindings/go/evmc/evmc.go b/bindings/go/evmc/evmc.go
index 913cc71..5584815 100644
--- a/bindings/go/evmc/evmc.go
+++ b/bindings/go/evmc/evmc.go
@@ -1,5 +1,5 @@
 // EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 Pawel Bylica.
+// Copyright 2018 The EVMC Authors.
 // Licensed under the MIT License. See the LICENSE file.
 
 package evmc
diff --git a/bindings/go/evmc/evmc_test.go b/bindings/go/evmc/evmc_test.go
index 2440026..e554c3b 100644
--- a/bindings/go/evmc/evmc_test.go
+++ b/bindings/go/evmc/evmc_test.go
@@ -1,5 +1,5 @@
 // EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 Pawel Bylica.
+// Copyright 2018 The EVMC Authors.
 // Licensed under the MIT License. See the LICENSE file.
 
 package evmc
diff --git a/bindings/go/evmc/host.c b/bindings/go/evmc/host.c
index 35bd5a3..bd9bc0a 100644
--- a/bindings/go/evmc/host.c
+++ b/bindings/go/evmc/host.c
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/bindings/go/evmc/host.go b/bindings/go/evmc/host.go
index f9abb24..1d34938 100644
--- a/bindings/go/evmc/host.go
+++ b/bindings/go/evmc/host.go
@@ -1,5 +1,5 @@
 // EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 Pawel Bylica.
+// Copyright 2018 The EVMC Authors.
 // Licensed under the MIT License. See the LICENSE file.
 
 package evmc
diff --git a/cmake/HunterConfig.cmake b/cmake/HunterConfig.cmake
index d55e4c3..0ff0503 100644
--- a/cmake/HunterConfig.cmake
+++ b/cmake/HunterConfig.cmake
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 # Setup Hunter.
diff --git a/examples/examplevm/CMakeLists.txt b/examples/examplevm/CMakeLists.txt
index 031d6eb..d36d3e0 100644
--- a/examples/examplevm/CMakeLists.txt
+++ b/examples/examplevm/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 include(GNUInstallDirs)
diff --git a/examples/examplevm/examplevm.h b/examples/examplevm/examplevm.h
index 37261ef..b36dc6c 100644
--- a/examples/examplevm/examplevm.h
+++ b/examples/examplevm/examplevm.h
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/examples/use_evmc_in_cmake/CMakeLists.txt b/examples/use_evmc_in_cmake/CMakeLists.txt
index 82725a2..ba2817d 100644
--- a/examples/use_evmc_in_cmake/CMakeLists.txt
+++ b/examples/use_evmc_in_cmake/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 # This example shows how to use evmc INTERFACE library from evmc CMake package.
diff --git a/examples/use_evmc_in_cmake/use_evmc_in_cmake.c b/examples/use_evmc_in_cmake/use_evmc_in_cmake.c
index 756555f..6be98c5 100644
--- a/examples/use_evmc_in_cmake/use_evmc_in_cmake.c
+++ b/examples/use_evmc_in_cmake/use_evmc_in_cmake.c
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/examples/use_instructions_in_cmake/CMakeLists.txt b/examples/use_instructions_in_cmake/CMakeLists.txt
index bf6f353..067b495 100644
--- a/examples/use_instructions_in_cmake/CMakeLists.txt
+++ b/examples/use_instructions_in_cmake/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 # This example shows how to use evmc::instructions library from evmc CMake package.
diff --git a/examples/use_instructions_in_cmake/use_instructions_in_cmake.c b/examples/use_instructions_in_cmake/use_instructions_in_cmake.c
index bd007e4..8ae3a70 100644
--- a/examples/use_instructions_in_cmake/use_instructions_in_cmake.c
+++ b/examples/use_instructions_in_cmake/use_instructions_in_cmake.c
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/include/evmc/helpers.h b/include/evmc/helpers.h
index 05e91b6..a0c3d12 100644
--- a/include/evmc/helpers.h
+++ b/include/evmc/helpers.h
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/include/evmc/instructions.h b/include/evmc/instructions.h
index 9c6d8ae..d5f3d90 100644
--- a/include/evmc/instructions.h
+++ b/include/evmc/instructions.h
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/include/evmc/loader.h b/include/evmc/loader.h
index fdb0108..f2170ec 100644
--- a/include/evmc/loader.h
+++ b/include/evmc/loader.h
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/include/evmc/utils.h b/include/evmc/utils.h
index 9ed7492..1e2b459 100644
--- a/include/evmc/utils.h
+++ b/include/evmc/utils.h
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2f751e2..4494254 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 add_subdirectory(instructions)
diff --git a/lib/instructions/CMakeLists.txt b/lib/instructions/CMakeLists.txt
index da6b9fb..b5585dc 100644
--- a/lib/instructions/CMakeLists.txt
+++ b/lib/instructions/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 add_library(
diff --git a/lib/instructions/instruction_metrics.c b/lib/instructions/instruction_metrics.c
index 49c0fba..81d29d0 100644
--- a/lib/instructions/instruction_metrics.c
+++ b/lib/instructions/instruction_metrics.c
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/lib/instructions/instruction_names.c b/lib/instructions/instruction_names.c
index c67b6f3..80b77e8 100644
--- a/lib/instructions/instruction_names.c
+++ b/lib/instructions/instruction_names.c
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/lib/loader/CMakeLists.txt b/lib/loader/CMakeLists.txt
index 4d06b9b..ab0f4ab 100644
--- a/lib/loader/CMakeLists.txt
+++ b/lib/loader/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 add_library(
diff --git a/lib/loader/loader.c b/lib/loader/loader.c
index d4fa12a..3964e67 100644
--- a/lib/loader/loader.c
+++ b/lib/loader/loader.c
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 207f529..24ac3c1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 hunter_add_package(GTest)
diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
index e3be47f..4136993 100644
--- a/test/integration/CMakeLists.txt
+++ b/test/integration/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 add_subdirectory(compilation)
diff --git a/test/integration/compilation/CMakeLists.txt b/test/integration/compilation/CMakeLists.txt
index c42121c..4b1fb3c 100644
--- a/test/integration/compilation/CMakeLists.txt
+++ b/test/integration/compilation/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 add_library(test-compile-c99 STATIC compilation_test.c)
diff --git a/test/integration/compilation/compilation_test.c b/test/integration/compilation/compilation_test.c
index d927244..2a1d689 100644
--- a/test/integration/compilation/compilation_test.c
+++ b/test/integration/compilation/compilation_test.c
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/test/unittests/CMakeLists.txt b/test/unittests/CMakeLists.txt
index 7115693..6ff4584 100644
--- a/test/unittests/CMakeLists.txt
+++ b/test/unittests/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 add_library(vm-mock SHARED vm_mock.c)
diff --git a/test/unittests/test_instructions.cpp b/test/unittests/test_instructions.cpp
index 24edbb1..2beba2e 100644
--- a/test/unittests/test_instructions.cpp
+++ b/test/unittests/test_instructions.cpp
@@ -1,5 +1,5 @@
 // EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 Pawel Bylica.
+// Copyright 2018 The EVMC Authors.
 // Licensed under the MIT License. See the LICENSE file.
 
 #include <evmc/instructions.h>
diff --git a/test/unittests/test_loader.cpp b/test/unittests/test_loader.cpp
index 8245f54..1151748 100644
--- a/test/unittests/test_loader.cpp
+++ b/test/unittests/test_loader.cpp
@@ -1,5 +1,5 @@
 // EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 Pawel Bylica.
+// Copyright 2018 The EVMC Authors.
 // Licensed under the MIT License. See the LICENSE file.
 
 #include <evmc/loader.h>
diff --git a/test/unittests/vm_mock.c b/test/unittests/vm_mock.c
index a0cb194..dd59f60 100644
--- a/test/unittests/vm_mock.c
+++ b/test/unittests/vm_mock.c
@@ -1,5 +1,5 @@
 /* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018 Pawel Bylica.
+ * Copyright 2018 The EVMC Authors.
  * Licensed under the MIT License. See the LICENSE file.
  */
 
diff --git a/test/vmtester/CMakeLists.txt b/test/vmtester/CMakeLists.txt
index 660fa74..9f6e3c7 100644
--- a/test/vmtester/CMakeLists.txt
+++ b/test/vmtester/CMakeLists.txt
@@ -1,5 +1,5 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018 Pawel Bylica.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the MIT License. See the LICENSE file.
 
 include(GNUInstallDirs)
diff --git a/test/vmtester/tests.cpp b/test/vmtester/tests.cpp
index 1009249..f2cbd51 100644
--- a/test/vmtester/tests.cpp
+++ b/test/vmtester/tests.cpp
@@ -1,5 +1,5 @@
 // EVMC -- Ethereum Client-VM Connector API
-// Copyright 2018 Pawel Bylica.
+// Copyright 2018 The EVMC Authors.
 // Licensed under the MIT License. See the LICENSE file.
 
 #include "vmtester.hpp"
diff --git a/test/vmtester/vmtester.cpp b/test/vmtester/vmtester.cpp
index 4f0f067..d4e6ca7 100644
--- a/test/vmtester/vmtester.cpp
+++ b/test/vmtester/vmtester.cpp
@@ -1,5 +1,5 @@
 // EVMC: Ethereum Client-VM Connector API.
-// Copyright 2018 Pawel Bylica.
+// Copyright 2018 The EVMC Authors.
 // Licensed under the MIT License. See the LICENSE file.
 
 #include "vmtester.hpp"
diff --git a/test/vmtester/vmtester.hpp b/test/vmtester/vmtester.hpp
index a815dd4..3845d09 100644
--- a/test/vmtester/vmtester.hpp
+++ b/test/vmtester/vmtester.hpp
@@ -1,5 +1,5 @@
 // EVMC: Ethereum Client-VM Connector API
-// Copyright 2018 Pawel Bylica.
+// Copyright 2018 The EVMC Authors.
 // Licensed under the MIT License. See the LICENSE file.
 
 #pragma once