diff --git a/src/core/compact_object.cc b/src/core/compact_object.cc
index 5d5eeb6b4..c774d1b64 100644
--- a/src/core/compact_object.cc
+++ b/src/core/compact_object.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/compact_object.h b/src/core/compact_object.h
index 4b9c7adc8..458a9c015 100644
--- a/src/core/compact_object.h
+++ b/src/core/compact_object.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/compact_object_test.cc b/src/core/compact_object_test.cc
index e3f6a19d4..a97338612 100644
--- a/src/core/compact_object_test.cc
+++ b/src/core/compact_object_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "core/compact_object.h"
diff --git a/src/core/core_types.h b/src/core/core_types.h
index 802397a25..087cbfe1a 100644
--- a/src/core/core_types.h
+++ b/src/core/core_types.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/dash.h b/src/core/dash.h
index 4add42dbc..490baeb8d 100644
--- a/src/core/dash.h
+++ b/src/core/dash.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/core/dash_bench.cc b/src/core/dash_bench.cc
index b4d19ea8f..194a85c8a 100644
--- a/src/core/dash_bench.cc
+++ b/src/core/dash_bench.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/dash_internal.h b/src/core/dash_internal.h
index e41c38866..8f3e9fc33 100644
--- a/src/core/dash_internal.h
+++ b/src/core/dash_internal.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/dash_test.cc b/src/core/dash_test.cc
index c00ba575b..fb9542e9e 100644
--- a/src/core/dash_test.cc
+++ b/src/core/dash_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/dense_set.cc b/src/core/dense_set.cc
index f362f5e62..fa535f24e 100644
--- a/src/core/dense_set.cc
+++ b/src/core/dense_set.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/dense_set.h b/src/core/dense_set.h
index f67eab8ef..e35a0b7bd 100644
--- a/src/core/dense_set.h
+++ b/src/core/dense_set.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/core/dfly_core_test.cc b/src/core/dfly_core_test.cc
index c2992ad6b..8f4c56e02 100644
--- a/src/core/dfly_core_test.cc
+++ b/src/core/dfly_core_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/dragonfly_core.cc b/src/core/dragonfly_core.cc
index d4fd1e826..4b9dabe65 100644
--- a/src/core/dragonfly_core.cc
+++ b/src/core/dragonfly_core.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -25,4 +25,4 @@ void IntentLock::VerifyDebug() {
   DCHECK_EQ(0u, cnt_[1] & kMsb);
 }
 
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/core/expire_period.h b/src/core/expire_period.h
index 6c0465e2f..6f8511eb2 100644
--- a/src/core/expire_period.h
+++ b/src/core/expire_period.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/extent_tree.cc b/src/core/extent_tree.cc
index 80438e895..4e1df248a 100644
--- a/src/core/extent_tree.cc
+++ b/src/core/extent_tree.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/extent_tree.h b/src/core/extent_tree.h
index 3152e5262..a4b0549cb 100644
--- a/src/core/extent_tree.h
+++ b/src/core/extent_tree.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/extent_tree_test.cc b/src/core/extent_tree_test.cc
index d93bcb593..d23f7c522 100644
--- a/src/core/extent_tree_test.cc
+++ b/src/core/extent_tree_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -55,4 +55,4 @@ TEST_F(ExtentTreeTest, Basic) {
   EXPECT_THAT(*op, testing::Pair(60, 92));
 }
 
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/core/external_alloc.cc b/src/core/external_alloc.cc
index ef213dc6a..968c07fe9 100644
--- a/src/core/external_alloc.cc
+++ b/src/core/external_alloc.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/external_alloc.h b/src/core/external_alloc.h
index 4241f800a..af65c9335 100644
--- a/src/core/external_alloc.h
+++ b/src/core/external_alloc.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/core/external_alloc_test.cc b/src/core/external_alloc_test.cc
index 7981fa52e..d2d99b7e3 100644
--- a/src/core/external_alloc_test.cc
+++ b/src/core/external_alloc_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -117,4 +117,4 @@ TEST_F(ExternalAllocatorTest, Classes) {
   EXPECT_EQ(1_MB + 4_KB, ExternalAllocator::GoodSize(1_MB + 1));
 }
 
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/core/flat_set.h b/src/core/flat_set.h
index 9f3e08b14..ffa92b344 100644
--- a/src/core/flat_set.h
+++ b/src/core/flat_set.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/intent_lock.h b/src/core/intent_lock.h
index 2787f9050..4d3c7e06f 100644
--- a/src/core/intent_lock.h
+++ b/src/core/intent_lock.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include <assert.h>
diff --git a/src/core/interpreter.cc b/src/core/interpreter.cc
index c181f37e8..f83ad61d4 100644
--- a/src/core/interpreter.cc
+++ b/src/core/interpreter.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index 12c4cdf0e..08187539c 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/interpreter_test.cc b/src/core/interpreter_test.cc
index d15f0fa55..e2864f15d 100644
--- a/src/core/interpreter_test.cc
+++ b/src/core/interpreter_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/json_test.cc b/src/core/json_test.cc
index de837cbc2..6d06929d2 100644
--- a/src/core/json_test.cc
+++ b/src/core/json_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/mi_memory_resource.cc b/src/core/mi_memory_resource.cc
index 017237a1d..37ed7d81a 100644
--- a/src/core/mi_memory_resource.cc
+++ b/src/core/mi_memory_resource.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "core/mi_memory_resource.h"
diff --git a/src/core/mi_memory_resource.h b/src/core/mi_memory_resource.h
index 4e15de02c..a6fc279c4 100644
--- a/src/core/mi_memory_resource.h
+++ b/src/core/mi_memory_resource.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -36,4 +36,4 @@ class MiMemoryResource : public std::pmr::memory_resource {
   size_t used_ = 0;
 };
 
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/core/segment_allocator.cc b/src/core/segment_allocator.cc
index 034e1048b..b909d52db 100644
--- a/src/core/segment_allocator.cc
+++ b/src/core/segment_allocator.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "core/segment_allocator.h"
diff --git a/src/core/segment_allocator.h b/src/core/segment_allocator.h
index 05e89a9ca..7c0b0d6f7 100644
--- a/src/core/segment_allocator.h
+++ b/src/core/segment_allocator.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/core/small_string.cc b/src/core/small_string.cc
index 6ae668e21..b5f3bac03 100644
--- a/src/core/small_string.cc
+++ b/src/core/small_string.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/core/small_string.h b/src/core/small_string.h
index 9ac3517d9..ef172c1da 100644
--- a/src/core/small_string.h
+++ b/src/core/small_string.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/core/string_set_test.cc b/src/core/string_set_test.cc
index c7f0f4d46..84614c059 100644
--- a/src/core/string_set_test.cc
+++ b/src/core/string_set_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -379,4 +379,4 @@ TEST_F(StringSetTest, Iteration) {
   EXPECT_EQ(to_insert.size(), 0);
 }
 
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/core/tx_queue.cc b/src/core/tx_queue.cc
index 955eae7c0..ce5f8d586 100644
--- a/src/core/tx_queue.cc
+++ b/src/core/tx_queue.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "core/tx_queue.h"
diff --git a/src/core/tx_queue.h b/src/core/tx_queue.h
index 0df6d00f5..51c8da3be 100644
--- a/src/core/tx_queue.h
+++ b/src/core/tx_queue.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/facade/conn_context.h b/src/facade/conn_context.h
index 542c3492b..55639a155 100644
--- a/src/facade/conn_context.h
+++ b/src/facade/conn_context.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/dragonfly_connection.cc b/src/facade/dragonfly_connection.cc
index 421f0e338..d2ec3a3c2 100644
--- a/src/facade/dragonfly_connection.cc
+++ b/src/facade/dragonfly_connection.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/dragonfly_connection.h b/src/facade/dragonfly_connection.h
index f7258af59..ecf3a212d 100644
--- a/src/facade/dragonfly_connection.h
+++ b/src/facade/dragonfly_connection.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/dragonfly_listener.cc b/src/facade/dragonfly_listener.cc
index 08c9b32be..960256496 100644
--- a/src/facade/dragonfly_listener.cc
+++ b/src/facade/dragonfly_listener.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/dragonfly_listener.h b/src/facade/dragonfly_listener.h
index 2b652d27e..b85bc9067 100644
--- a/src/facade/dragonfly_listener.h
+++ b/src/facade/dragonfly_listener.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/error.h b/src/facade/error.h
index 4efda1e2a..740b17ead 100644
--- a/src/facade/error.h
+++ b/src/facade/error.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/facade.cc b/src/facade/facade.cc
index 3a9ec19f7..b8f2cd7d6 100644
--- a/src/facade/facade.cc
+++ b/src/facade/facade.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/facade_test.cc b/src/facade/facade_test.cc
index 3b612670d..78e7c325d 100644
--- a/src/facade/facade_test.cc
+++ b/src/facade/facade_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/facade_test.h b/src/facade/facade_test.h
index f6999999a..c0b5add9d 100644
--- a/src/facade/facade_test.h
+++ b/src/facade/facade_test.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/facade_types.h b/src/facade/facade_types.h
index 2d5f59d28..4878da067 100644
--- a/src/facade/facade_types.h
+++ b/src/facade/facade_types.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/memcache_parser.cc b/src/facade/memcache_parser.cc
index b12dada3b..68d7439db 100644
--- a/src/facade/memcache_parser.cc
+++ b/src/facade/memcache_parser.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "facade/memcache_parser.h"
@@ -173,4 +173,4 @@ auto MP::Parse(string_view str, uint32_t* consumed, Command* cmd) -> Result {
   return ParseValueless(tokens + 1, num_tokens - 1, cmd);
 };
 
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/facade/memcache_parser.h b/src/facade/memcache_parser.h
index fc3a6b759..39d9daf22 100644
--- a/src/facade/memcache_parser.h
+++ b/src/facade/memcache_parser.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -75,4 +75,4 @@ class MemcacheParser {
  private:
 };
 
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/facade/memcache_parser_test.cc b/src/facade/memcache_parser_test.cc
index f8d886465..fd1522c4b 100644
--- a/src/facade/memcache_parser_test.cc
+++ b/src/facade/memcache_parser_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -78,4 +78,4 @@ TEST_F(MCParserTest, Stats) {
   EXPECT_EQ(MemcacheParser::PARSE_ERROR, st);
 }
 
-}  // namespace facade
\ No newline at end of file
+}  // namespace facade
diff --git a/src/facade/ok_main.cc b/src/facade/ok_main.cc
index 3519fec5a..44360a474 100644
--- a/src/facade/ok_main.cc
+++ b/src/facade/ok_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/op_status.h b/src/facade/op_status.h
index 3d4c7c72d..0cd9ab73e 100644
--- a/src/facade/op_status.h
+++ b/src/facade/op_status.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/redis_parser.cc b/src/facade/redis_parser.cc
index 1eb3342c1..f2cf118ff 100644
--- a/src/facade/redis_parser.cc
+++ b/src/facade/redis_parser.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "facade/redis_parser.h"
diff --git a/src/facade/redis_parser.h b/src/facade/redis_parser.h
index 07562132d..7ce32f237 100644
--- a/src/facade/redis_parser.h
+++ b/src/facade/redis_parser.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/facade/redis_parser_test.cc b/src/facade/redis_parser_test.cc
index 39ab8670a..8d5c076c0 100644
--- a/src/facade/redis_parser_test.cc
+++ b/src/facade/redis_parser_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/facade/reply_builder.cc b/src/facade/reply_builder.cc
index 1213a6f29..ab54931c6 100644
--- a/src/facade/reply_builder.cc
+++ b/src/facade/reply_builder.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "facade/reply_builder.h"
diff --git a/src/facade/reply_builder.h b/src/facade/reply_builder.h
index 499a94361..60fba486d 100644
--- a/src/facade/reply_builder.h
+++ b/src/facade/reply_builder.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include <absl/container/flat_hash_map.h>
diff --git a/src/facade/resp_expr.h b/src/facade/resp_expr.h
index bfc81cb77..28d123a2d 100644
--- a/src/facade/resp_expr.h
+++ b/src/facade/resp_expr.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -56,4 +56,4 @@ namespace std {
 ostream& operator<<(ostream& os, const facade::RespExpr& e);
 ostream& operator<<(ostream& os, facade::RespSpan rspan);
 
-}  // namespace std
\ No newline at end of file
+}  // namespace std
diff --git a/src/facade/service_interface.h b/src/facade/service_interface.h
index 7cf691222..c38ad26e4 100644
--- a/src/facade/service_interface.h
+++ b/src/facade/service_interface.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/redis/zmalloc_mi.c b/src/redis/zmalloc_mi.c
index 66aca4529..42899a216 100644
--- a/src/redis/zmalloc_mi.c
+++ b/src/redis/zmalloc_mi.c
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/blocking_controller.cc b/src/server/blocking_controller.cc
index 60d3fe77e..700d6699c 100644
--- a/src/server/blocking_controller.cc
+++ b/src/server/blocking_controller.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/blocking_controller.h b/src/server/blocking_controller.h
index f856321b6..a1dc82483 100644
--- a/src/server/blocking_controller.h
+++ b/src/server/blocking_controller.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/blocking_controller_test.cc b/src/server/blocking_controller_test.cc
index 1fe04c480..9e2f87670 100644
--- a/src/server/blocking_controller_test.cc
+++ b/src/server/blocking_controller_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/channel_slice.cc b/src/server/channel_slice.cc
index 650190d51..361ce4c67 100644
--- a/src/server/channel_slice.cc
+++ b/src/server/channel_slice.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/channel_slice.h b/src/server/channel_slice.h
index 9d8d8610f..558159b70 100644
--- a/src/server/channel_slice.h
+++ b/src/server/channel_slice.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/server/command_registry.cc b/src/server/command_registry.cc
index 7cca1919f..6d577907f 100644
--- a/src/server/command_registry.cc
+++ b/src/server/command_registry.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/command_registry.h b/src/server/command_registry.h
index 1441ebbbc..7dc9e8204 100644
--- a/src/server/command_registry.h
+++ b/src/server/command_registry.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/common.cc b/src/server/common.cc
index 91638c00d..06911663a 100644
--- a/src/server/common.cc
+++ b/src/server/common.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/common.h b/src/server/common.h
index 55c25939a..dc3d692ee 100644
--- a/src/server/common.h
+++ b/src/server/common.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/config_flags.cc b/src/server/config_flags.cc
index 736156ce6..ec853f4bc 100644
--- a/src/server/config_flags.cc
+++ b/src/server/config_flags.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "server/config_flags.h"
diff --git a/src/server/config_flags.h b/src/server/config_flags.h
index 7c2a4f9f3..3dac760ce 100644
--- a/src/server/config_flags.h
+++ b/src/server/config_flags.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -89,4 +89,3 @@ inline bool TrueValidator(const char* nm, const std::string& val) {
 
 #define CONFIG_enum(name, val, txt, enum_arr, dest_var)    \
     CONFIG_string(name, val, txt, BIND_ENUM_CONFIG(enum_arr, dest_var))
-
diff --git a/src/server/conn_context.cc b/src/server/conn_context.cc
index 791aca334..10454dd99 100644
--- a/src/server/conn_context.cc
+++ b/src/server/conn_context.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/conn_context.h b/src/server/conn_context.h
index 80d046f5a..ab3e5c269 100644
--- a/src/server/conn_context.h
+++ b/src/server/conn_context.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/db_slice.cc b/src/server/db_slice.cc
index f3e5b5977..bb81db6bd 100644
--- a/src/server/db_slice.cc
+++ b/src/server/db_slice.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/db_slice.h b/src/server/db_slice.h
index fa0f8ba92..e253b6bdb 100644
--- a/src/server/db_slice.h
+++ b/src/server/db_slice.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/debugcmd.cc b/src/server/debugcmd.cc
index fd7c335fa..41599f74e 100644
--- a/src/server/debugcmd.cc
+++ b/src/server/debugcmd.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "server/debugcmd.h"
diff --git a/src/server/debugcmd.h b/src/server/debugcmd.h
index ea185e0d1..00a049291 100644
--- a/src/server/debugcmd.h
+++ b/src/server/debugcmd.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/detail/table.h b/src/server/detail/table.h
index af7c00214..14dc271f8 100644
--- a/src/server/detail/table.h
+++ b/src/server/detail/table.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -69,4 +69,4 @@ struct ExpireTablePolicy {
 };
 
 }  // namespace detail
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/server/dfly_main.cc b/src/server/dfly_main.cc
index f38e0e6ad..0c84cce2b 100644
--- a/src/server/dfly_main.cc
+++ b/src/server/dfly_main.cc
@@ -1,5 +1,5 @@
 
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/dflycmd.cc b/src/server/dflycmd.cc
index 395cc23c4..e178dd8ac 100644
--- a/src/server/dflycmd.cc
+++ b/src/server/dflycmd.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "server/dflycmd.h"
diff --git a/src/server/dflycmd.h b/src/server/dflycmd.h
index 657277b06..36140e070 100644
--- a/src/server/dflycmd.h
+++ b/src/server/dflycmd.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/dragonfly_test.cc b/src/server/dragonfly_test.cc
index b766e085b..8a1ef874c 100644
--- a/src/server/dragonfly_test.cc
+++ b/src/server/dragonfly_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/engine_shard_set.cc b/src/server/engine_shard_set.cc
index 3a2f8c1c7..9227cbb46 100644
--- a/src/server/engine_shard_set.cc
+++ b/src/server/engine_shard_set.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/engine_shard_set.h b/src/server/engine_shard_set.h
index 005be2e3b..200b58be2 100644
--- a/src/server/engine_shard_set.h
+++ b/src/server/engine_shard_set.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/error.h b/src/server/error.h
index 1c5f7d59b..ea09e9065 100644
--- a/src/server/error.h
+++ b/src/server/error.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/generic_family.cc b/src/server/generic_family.cc
index 60550bbeb..130ddf4b7 100644
--- a/src/server/generic_family.cc
+++ b/src/server/generic_family.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/generic_family.h b/src/server/generic_family.h
index 470e754fe..dd4b526f0 100644
--- a/src/server/generic_family.h
+++ b/src/server/generic_family.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/generic_family_test.cc b/src/server/generic_family_test.cc
index e008d0893..6ac0f63f5 100644
--- a/src/server/generic_family_test.cc
+++ b/src/server/generic_family_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -157,8 +157,8 @@ TEST_F(GenericFamilyTest, RenameNx) {
   // Set two keys
   string b_val(32, 'b');
   string x_val(32, 'x');
-  Run({"mset", "x", x_val, "b", b_val});  
-    
+  Run({"mset", "x", x_val, "b", b_val});
+
   ASSERT_THAT(Run({"renamenx", "z", "b"}), ErrArg("no such key"));
   ASSERT_THAT(Run({"renamenx", "x", "b"}), IntArg(0)); // b already exists
   ASSERT_THAT(Run({"renamenx", "x", "y"}), IntArg(1));
diff --git a/src/server/hset_family.cc b/src/server/hset_family.cc
index aaf92bca0..6f4862fd6 100644
--- a/src/server/hset_family.cc
+++ b/src/server/hset_family.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/hset_family.h b/src/server/hset_family.h
index c1e958198..d45d378cf 100644
--- a/src/server/hset_family.h
+++ b/src/server/hset_family.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/hset_family_test.cc b/src/server/hset_family_test.cc
index f2d9b5b69..c1778be50 100644
--- a/src/server/hset_family_test.cc
+++ b/src/server/hset_family_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/io_mgr.cc b/src/server/io_mgr.cc
index 51874de0a..58ccfde5a 100644
--- a/src/server/io_mgr.cc
+++ b/src/server/io_mgr.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/io_mgr.h b/src/server/io_mgr.h
index d09df6fc5..61de32525 100644
--- a/src/server/io_mgr.h
+++ b/src/server/io_mgr.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/journal/journal.cc b/src/server/journal/journal.cc
index 35dac782b..3e461ca53 100644
--- a/src/server/journal/journal.cc
+++ b/src/server/journal/journal.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/journal/journal.h b/src/server/journal/journal.h
index e26b99cbc..14b71bde5 100644
--- a/src/server/journal/journal.h
+++ b/src/server/journal/journal.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/journal/journal_shard.cc b/src/server/journal/journal_shard.cc
index bae1cbd3b..73d11df3a 100644
--- a/src/server/journal/journal_shard.cc
+++ b/src/server/journal/journal_shard.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -112,4 +112,4 @@ void JournalShard::AddLogRecord(TxId txid, unsigned opcode) {
 }
 
 }  // namespace journal
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/server/journal/journal_shard.h b/src/server/journal/journal_shard.h
index f58c4b98b..9e4860ef3 100644
--- a/src/server/journal/journal_shard.h
+++ b/src/server/journal/journal_shard.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -53,4 +53,4 @@ class JournalShard {
 };
 
 }  // namespace journal
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/server/json_family.cc b/src/server/json_family.cc
index a880bc331..3b3b87c60 100644
--- a/src/server/json_family.cc
+++ b/src/server/json_family.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/json_family.h b/src/server/json_family.h
index 7d571dd78..9fc93fce9 100644
--- a/src/server/json_family.h
+++ b/src/server/json_family.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/json_family_test.cc b/src/server/json_family_test.cc
index ce82acb2f..886a86337 100644
--- a/src/server/json_family_test.cc
+++ b/src/server/json_family_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/list_family.cc b/src/server/list_family.cc
index 2224c7c31..08d771dd8 100644
--- a/src/server/list_family.cc
+++ b/src/server/list_family.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "server/list_family.h"
diff --git a/src/server/list_family.h b/src/server/list_family.h
index 87778c0c9..4e281b8be 100644
--- a/src/server/list_family.h
+++ b/src/server/list_family.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/list_family_test.cc b/src/server/list_family_test.cc
index 83206304a..4b66105aa 100644
--- a/src/server/list_family_test.cc
+++ b/src/server/list_family_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/main_service.cc b/src/server/main_service.cc
index 63dbb30de..d6f5cd148 100644
--- a/src/server/main_service.cc
+++ b/src/server/main_service.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/main_service.h b/src/server/main_service.h
index ffaaebb45..09f70ffaf 100644
--- a/src/server/main_service.h
+++ b/src/server/main_service.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/malloc_stats.cc b/src/server/malloc_stats.cc
index 22657723b..fe6004ff8 100644
--- a/src/server/malloc_stats.cc
+++ b/src/server/malloc_stats.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/rdb_load.cc b/src/server/rdb_load.cc
index d44615331..ce0b8f6b8 100644
--- a/src/server/rdb_load.cc
+++ b/src/server/rdb_load.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/rdb_load.h b/src/server/rdb_load.h
index 5f01991ea..f05baa0cf 100644
--- a/src/server/rdb_load.h
+++ b/src/server/rdb_load.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/server/rdb_save.cc b/src/server/rdb_save.cc
index a114288fa..f7370e8d8 100644
--- a/src/server/rdb_save.cc
+++ b/src/server/rdb_save.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/rdb_save.h b/src/server/rdb_save.h
index 95dda6be4..153079079 100644
--- a/src/server/rdb_save.h
+++ b/src/server/rdb_save.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/server/rdb_test.cc b/src/server/rdb_test.cc
index 14e88daa7..4dcb81726 100644
--- a/src/server/rdb_test.cc
+++ b/src/server/rdb_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include <gmock/gmock.h>
diff --git a/src/server/replica.cc b/src/server/replica.cc
index 828e581d9..2c17551c8 100644
--- a/src/server/replica.cc
+++ b/src/server/replica.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include "server/replica.h"
diff --git a/src/server/replica.h b/src/server/replica.h
index 6b2f0e0d5..ae1efc0e0 100644
--- a/src/server/replica.h
+++ b/src/server/replica.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/server/script_mgr.cc b/src/server/script_mgr.cc
index e635c17e1..675a650c0 100644
--- a/src/server/script_mgr.cc
+++ b/src/server/script_mgr.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/script_mgr.h b/src/server/script_mgr.h
index 6ef68c462..899ead539 100644
--- a/src/server/script_mgr.h
+++ b/src/server/script_mgr.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/server_family.cc b/src/server/server_family.cc
index b652bdb3b..50f51ffaf 100644
--- a/src/server/server_family.cc
+++ b/src/server/server_family.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/server_family.h b/src/server/server_family.h
index 27692ca37..b97449b6f 100644
--- a/src/server/server_family.h
+++ b/src/server/server_family.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/server_state.h b/src/server/server_state.h
index 34261fb7a..f06763353 100644
--- a/src/server/server_state.h
+++ b/src/server/server_state.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/set_family.cc b/src/server/set_family.cc
index 49d9aba87..cd36b6c70 100644
--- a/src/server/set_family.cc
+++ b/src/server/set_family.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/set_family.h b/src/server/set_family.h
index 9bd1a224d..847014719 100644
--- a/src/server/set_family.h
+++ b/src/server/set_family.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/set_family_test.cc b/src/server/set_family_test.cc
index c70d73edd..5d468cf88 100644
--- a/src/server/set_family_test.cc
+++ b/src/server/set_family_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/snapshot.cc b/src/server/snapshot.cc
index 9a776f094..efd19adce 100644
--- a/src/server/snapshot.cc
+++ b/src/server/snapshot.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/snapshot.h b/src/server/snapshot.h
index 0e34e20ea..42af9114d 100644
--- a/src/server/snapshot.h
+++ b/src/server/snapshot.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/snapshot_test.cc b/src/server/snapshot_test.cc
index 1b818fc81..ec462f273 100644
--- a/src/server/snapshot_test.cc
+++ b/src/server/snapshot_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #include <gmock/gmock.h>
diff --git a/src/server/stream_family.cc b/src/server/stream_family.cc
index 3caa9a9c6..be9d6aafe 100644
--- a/src/server/stream_family.cc
+++ b/src/server/stream_family.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/stream_family.h b/src/server/stream_family.h
index 172696754..f2bbfe673 100644
--- a/src/server/stream_family.h
+++ b/src/server/stream_family.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/stream_family_test.cc b/src/server/stream_family_test.cc
index a7e850621..913413787 100644
--- a/src/server/stream_family_test.cc
+++ b/src/server/stream_family_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
@@ -84,4 +84,4 @@ TEST_F(StreamFamilyTest, Range) {
   EXPECT_THAT(sub1, ElementsAre("1-0", ArrLen(2)));
 }
 
-}  // namespace dfly
\ No newline at end of file
+}  // namespace dfly
diff --git a/src/server/string_family.cc b/src/server/string_family.cc
index 458cf885b..50570c89a 100644
--- a/src/server/string_family.cc
+++ b/src/server/string_family.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/string_family.h b/src/server/string_family.h
index 56c6f5141..bc0d80f19 100644
--- a/src/server/string_family.h
+++ b/src/server/string_family.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/string_family_test.cc b/src/server/string_family_test.cc
index ce840a6f5..c9c78dcb6 100644
--- a/src/server/string_family_test.cc
+++ b/src/server/string_family_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/table.cc b/src/server/table.cc
index 76f98025e..305ec1ff5 100644
--- a/src/server/table.cc
+++ b/src/server/table.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/table.h b/src/server/table.h
index d231f8649..5b305cd99 100644
--- a/src/server/table.h
+++ b/src/server/table.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/test_utils.cc b/src/server/test_utils.cc
index f88ce5e53..ce9acc19f 100644
--- a/src/server/test_utils.cc
+++ b/src/server/test_utils.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/test_utils.h b/src/server/test_utils.h
index bb963c42a..7ac06084f 100644
--- a/src/server/test_utils.h
+++ b/src/server/test_utils.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/tiered_storage.cc b/src/server/tiered_storage.cc
index bf5c30215..2639c7679 100644
--- a/src/server/tiered_storage.cc
+++ b/src/server/tiered_storage.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/tiered_storage.h b/src/server/tiered_storage.h
index 5fdd82dcd..fdf9c4614 100644
--- a/src/server/tiered_storage.h
+++ b/src/server/tiered_storage.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 #pragma once
diff --git a/src/server/transaction.cc b/src/server/transaction.cc
index c792d1e4a..f0790e294 100644
--- a/src/server/transaction.cc
+++ b/src/server/transaction.cc
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/transaction.h b/src/server/transaction.h
index 24d01df26..b3fa6d462 100644
--- a/src/server/transaction.h
+++ b/src/server/transaction.h
@@ -1,4 +1,4 @@
-// Copyright 2021, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/version.cc.in b/src/server/version.cc.in
index 37753b281..f8edddf85 100644
--- a/src/server/version.cc.in
+++ b/src/server/version.cc.in
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/version.h b/src/server/version.h
index 5ea3a5839..390b5eeb2 100644
--- a/src/server/version.h
+++ b/src/server/version.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/zset_family.cc b/src/server/zset_family.cc
index 58d549ab1..d57b4de35 100644
--- a/src/server/zset_family.cc
+++ b/src/server/zset_family.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/zset_family.h b/src/server/zset_family.h
index 801e3561e..ced187e4e 100644
--- a/src/server/zset_family.h
+++ b/src/server/zset_family.h
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //
 
diff --git a/src/server/zset_family_test.cc b/src/server/zset_family_test.cc
index cbdcf7890..e416afe14 100644
--- a/src/server/zset_family_test.cc
+++ b/src/server/zset_family_test.cc
@@ -1,4 +1,4 @@
-// Copyright 2022, Roman Gershman.  All rights reserved.
+// Copyright 2022, DragonflyDB authors.  All rights reserved.
 // See LICENSE for licensing terms.
 //