diff --git a/COPYING b/COPYING
index 2058f57e56..81d9209436 100644
--- a/COPYING
+++ b/COPYING
@@ -17,7 +17,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 BSD 3-Clause License
 
-Copyright (c) 2006-2020, Salvatore Sanfilippo
+Copyright (c) 2006-2020, Redis Ltd.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/deps/fpconv/fpconv_powers.h b/deps/fpconv/fpconv_powers.h
index bc488f6dd1..1855cd4bc7 100644
--- a/deps/fpconv/fpconv_powers.h
+++ b/deps/fpconv/fpconv_powers.h
@@ -6,7 +6,7 @@
  * [1] https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2021, Redis Labs
+ * Copyright (c) 2021, Redis Ltd.
  * Copyright (c) 2013-2019, night-shift <as.smljk at gmail dot com>
  * Copyright (c) 2009, Florian Loitsch < florian.loitsch at inria dot fr >
  * All rights reserved.
diff --git a/deps/hiredis/COPYING b/deps/hiredis/COPYING
index a5fc973955..c94d2de467 100644
--- a/deps/hiredis/COPYING
+++ b/deps/hiredis/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+Copyright (c) 2009-2011, Redis Ltd.
 Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
 
 All rights reserved.
diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
index bd2106b1d1..4a3de1f6ec 100644
--- a/deps/hiredis/Makefile
+++ b/deps/hiredis/Makefile
@@ -1,5 +1,5 @@
 # Hiredis Makefile
-# Copyright (C) 2010-2011 Salvatore Sanfilippo <antirez at gmail dot com>
+# Copyright (C) 2010-2011 Redis Ltd.
 # Copyright (C) 2010-2011 Pieter Noordhuis <pcnoordhuis at gmail dot com>
 # This file is released under the BSD license, see the COPYING file
 
diff --git a/deps/hiredis/async.c b/deps/hiredis/async.c
index 3d39cfaf81..1402160d88 100644
--- a/deps/hiredis/async.c
+++ b/deps/hiredis/async.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  *
  * All rights reserved.
diff --git a/deps/hiredis/async.h b/deps/hiredis/async.h
index 4f94660b12..98d1432a7b 100644
--- a/deps/hiredis/async.h
+++ b/deps/hiredis/async.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  *
  * All rights reserved.
diff --git a/deps/hiredis/async_private.h b/deps/hiredis/async_private.h
index ea0558d429..535ccd9e19 100644
--- a/deps/hiredis/async_private.h
+++ b/deps/hiredis/async_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  *
  * All rights reserved.
diff --git a/deps/hiredis/dict.c b/deps/hiredis/dict.c
index ad571818e2..7333e7ef44 100644
--- a/deps/hiredis/dict.c
+++ b/deps/hiredis/dict.c
@@ -5,7 +5,7 @@
  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/deps/hiredis/dict.h b/deps/hiredis/dict.h
index 6ad0acd8d2..7e28cc6cd5 100644
--- a/deps/hiredis/dict.h
+++ b/deps/hiredis/dict.h
@@ -5,7 +5,7 @@
  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/deps/hiredis/fuzzing/format_command_fuzzer.c b/deps/hiredis/fuzzing/format_command_fuzzer.c
index de125e08da..aaaaf60813 100644
--- a/deps/hiredis/fuzzing/format_command_fuzzer.c
+++ b/deps/hiredis/fuzzing/format_command_fuzzer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2020, Redis Ltd.
  * Copyright (c) 2020, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  * Copyright (c) 2020, Matt Stancliff <matt at genges dot com>,
  *                     Jan-Erik Rediger <janerik at fnordig dot com>
diff --git a/deps/hiredis/hiredis.c b/deps/hiredis/hiredis.c
index 8012035a05..30d6a231e9 100644
--- a/deps/hiredis/hiredis.c
+++ b/deps/hiredis/hiredis.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
  *                     Jan-Erik Rediger <janerik at fnordig dot com>
diff --git a/deps/hiredis/hiredis.h b/deps/hiredis/hiredis.h
index 635988b7e1..84ff3af559 100644
--- a/deps/hiredis/hiredis.h
+++ b/deps/hiredis/hiredis.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
  *                     Jan-Erik Rediger <janerik at fnordig dot com>
diff --git a/deps/hiredis/hiredis_ssl.h b/deps/hiredis/hiredis_ssl.h
index 5f92cca9bc..093fe3a000 100644
--- a/deps/hiredis/hiredis_ssl.h
+++ b/deps/hiredis/hiredis_ssl.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2019, Redis Labs
+ * Copyright (c) 2019, Redis Ltd.
  *
  * All rights reserved.
  *
diff --git a/deps/hiredis/net.c b/deps/hiredis/net.c
index 33fe0b94f4..698fd5cec0 100644
--- a/deps/hiredis/net.c
+++ b/deps/hiredis/net.c
@@ -1,6 +1,6 @@
 /* Extracted from anet.c to work properly with Hiredis error reporting.
  *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
  *                     Jan-Erik Rediger <janerik at fnordig dot com>
diff --git a/deps/hiredis/net.h b/deps/hiredis/net.h
index e15d462647..d3372a168f 100644
--- a/deps/hiredis/net.h
+++ b/deps/hiredis/net.h
@@ -1,6 +1,6 @@
 /* Extracted from anet.c to work properly with Hiredis error reporting.
  *
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2014, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  * Copyright (c) 2015, Matt Stancliff <matt at genges dot com>,
  *                     Jan-Erik Rediger <janerik at fnordig dot com>
diff --git a/deps/hiredis/read.c b/deps/hiredis/read.c
index dd038c55bd..1198d7063b 100644
--- a/deps/hiredis/read.c
+++ b/deps/hiredis/read.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  *
  * All rights reserved.
diff --git a/deps/hiredis/read.h b/deps/hiredis/read.h
index 2d74d77a5b..8c6ec41fc0 100644
--- a/deps/hiredis/read.h
+++ b/deps/hiredis/read.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  *
  * All rights reserved.
diff --git a/deps/hiredis/sds.c b/deps/hiredis/sds.c
index ac2b483525..49cbf57ffd 100644
--- a/deps/hiredis/sds.c
+++ b/deps/hiredis/sds.c
@@ -1,8 +1,7 @@
 /* SDSLib 2.0 -- A C dynamic strings library
  *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2015, Redis Ltd.
  * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/deps/hiredis/sds.h b/deps/hiredis/sds.h
index 7f0ca5dfa5..304dd1290f 100644
--- a/deps/hiredis/sds.h
+++ b/deps/hiredis/sds.h
@@ -1,8 +1,7 @@
 /* SDSLib 2.0 -- A C dynamic strings library
  *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2015, Redis Ltd.
  * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/deps/hiredis/sdsalloc.h b/deps/hiredis/sdsalloc.h
index c9dcc3df8e..962b61ac8d 100644
--- a/deps/hiredis/sdsalloc.h
+++ b/deps/hiredis/sdsalloc.h
@@ -1,8 +1,7 @@
 /* SDSLib 2.0 -- A C dynamic strings library
  *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2015, Redis Ltd.
  * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/deps/hiredis/ssl.c b/deps/hiredis/ssl.c
index 9ab18cc0e5..5cfa45d626 100644
--- a/deps/hiredis/ssl.c
+++ b/deps/hiredis/ssl.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2011, Redis Ltd.
  * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2019, Redis Labs
+ * Copyright (c) 2019, Redis Ltd.
  *
  * All rights reserved.
  *
diff --git a/deps/linenoise/linenoise.c b/deps/linenoise/linenoise.c
index 36d266f891..ce2d2b7c42 100644
--- a/deps/linenoise/linenoise.c
+++ b/deps/linenoise/linenoise.c
@@ -10,7 +10,7 @@
  *
  * ------------------------------------------------------------------------
  *
- * Copyright (c) 2010-2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2016, Redis Ltd.
  * Copyright (c) 2010-2013, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  *
  * All rights reserved.
diff --git a/deps/linenoise/linenoise.h b/deps/linenoise/linenoise.h
index beac6df467..ca351fb8b2 100644
--- a/deps/linenoise/linenoise.h
+++ b/deps/linenoise/linenoise.h
@@ -7,7 +7,7 @@
  *
  * ------------------------------------------------------------------------
  *
- * Copyright (c) 2010-2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2014, Redis Ltd.
  * Copyright (c) 2010-2013, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  *
  * All rights reserved.
diff --git a/deps/lua/src/lua_cmsgpack.c b/deps/lua/src/lua_cmsgpack.c
index 5f8929d454..9ac967e23e 100644
--- a/deps/lua/src/lua_cmsgpack.c
+++ b/deps/lua/src/lua_cmsgpack.c
@@ -10,7 +10,7 @@
 #define LUACMSGPACK_NAME        "cmsgpack"
 #define LUACMSGPACK_SAFE_NAME   "cmsgpack_safe"
 #define LUACMSGPACK_VERSION     "lua-cmsgpack 0.4.0"
-#define LUACMSGPACK_COPYRIGHT   "Copyright (C) 2012, Salvatore Sanfilippo"
+#define LUACMSGPACK_COPYRIGHT   "Copyright (C) 2012, Redis Ltd."
 #define LUACMSGPACK_DESCRIPTION "MessagePack C implementation for Lua"
 
 /* Allows a preprocessor directive to override MAX_NESTING */
@@ -39,7 +39,7 @@
 
 /* =============================================================================
  * MessagePack implementation and bindings for Lua 5.1/5.2.
- * Copyright(C) 2012 Salvatore Sanfilippo <antirez@gmail.com>
+ * Copyright(C) 2012 Redis Ltd.
  *
  * http://github.com/antirez/lua-cmsgpack
  *
@@ -958,7 +958,7 @@ LUALIB_API int luaopen_cmsgpack_safe(lua_State *L) {
 }
 
 /******************************************************************************
-* Copyright (C) 2012 Salvatore Sanfilippo.  All rights reserved.
+* Copyright (C) 2012 Redis Ltd.  All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
diff --git a/src/Makefile b/src/Makefile
index eaf0e4e387..d69bd915dc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 # Valkey Makefile
-# Copyright (C) 2009 Salvatore Sanfilippo <antirez at gmail dot com>
+# Copyright (C) 2009 Redis Ltd.
 # This file is released under the BSD license, see the COPYING file
 #
 # The Makefile composes the final FINAL_CFLAGS and FINAL_LDFLAGS using
diff --git a/src/acl.c b/src/acl.c
index 51aa567165..89ac04a31e 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2018, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/adlist.c b/src/adlist.c
index 05f7eccb6f..11b152592b 100644
--- a/src/adlist.c
+++ b/src/adlist.c
@@ -1,6 +1,6 @@
 /* adlist.c - A generic doubly linked list implementation
  *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/adlist.h b/src/adlist.h
index 6d28f3abc1..bfc4280434 100644
--- a/src/adlist.h
+++ b/src/adlist.h
@@ -1,6 +1,6 @@
 /* adlist.h - A generic doubly linked list implementation
  *
- * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ae.c b/src/ae.c
index 36b6131410..ef7ba7bd67 100644
--- a/src/ae.c
+++ b/src/ae.c
@@ -2,7 +2,7 @@
  * for the Jim's event-loop (Jim is a Tcl interpreter) but later translated
  * it in form of a library for easy reuse.
  *
- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2010, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ae.h b/src/ae.h
index 652b42a8f5..1156819c9c 100644
--- a/src/ae.h
+++ b/src/ae.h
@@ -2,7 +2,7 @@
  * for the Jim's event-loop (Jim is a Tcl interpreter) but later translated
  * it in form of a library for easy reuse.
  *
- * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ae_epoll.c b/src/ae_epoll.c
index c8b4ac743f..b2410ca29a 100644
--- a/src/ae_epoll.c
+++ b/src/ae_epoll.c
@@ -1,6 +1,6 @@
 /* Linux epoll(2) based ae.c module
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ae_select.c b/src/ae_select.c
index 08ed381aba..12db491706 100644
--- a/src/ae_select.c
+++ b/src/ae_select.c
@@ -1,6 +1,6 @@
 /* Select()-based ae.c module.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/anet.c b/src/anet.c
index d0547b7769..36dd1b411b 100644
--- a/src/anet.c
+++ b/src/anet.c
@@ -1,6 +1,6 @@
 /* anet.c -- Basic TCP socket stuff made a bit less boring
  *
- * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/anet.h b/src/anet.h
index c3642f8e72..a230eabbf2 100644
--- a/src/anet.h
+++ b/src/anet.h
@@ -1,6 +1,6 @@
 /* anet.c -- Basic TCP socket stuff made a bit less boring
  *
- * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/aof.c b/src/aof.c
index d43616c888..b0b277c06d 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/asciilogo.h b/src/asciilogo.h
index bd20defa9e..2b2b381758 100644
--- a/src/asciilogo.h
+++ b/src/asciilogo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * Copyright (c) 2024, Valkey contributors
  * All rights reserved.
  *
diff --git a/src/atomicvar.h b/src/atomicvar.h
index d79cf4c9d7..62235e24ae 100644
--- a/src/atomicvar.h
+++ b/src/atomicvar.h
@@ -45,7 +45,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2015, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/bio.c b/src/bio.c
index 11692e77ef..e55c729f74 100644
--- a/src/bio.c
+++ b/src/bio.c
@@ -31,7 +31,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/bio.h b/src/bio.h
index 0d1fe9b4b9..80cf515380 100644
--- a/src/bio.h
+++ b/src/bio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/bitops.c b/src/bitops.c
index 2094bb0ea9..10c383b270 100644
--- a/src/bitops.c
+++ b/src/bitops.c
@@ -1,6 +1,6 @@
 /* Bit operations.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/blocked.c b/src/blocked.c
index 56dc02dec0..5f4c5d4494 100644
--- a/src/blocked.c
+++ b/src/blocked.c
@@ -1,6 +1,6 @@
 /* blocked.c - generic support for blocking operations like BLPOP & WAIT.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/call_reply.c b/src/call_reply.c
index dcb05cc850..00d196081e 100644
--- a/src/call_reply.c
+++ b/src/call_reply.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2021, Redis Labs Ltd.
+ * Copyright (c) 2009-2021, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/call_reply.h b/src/call_reply.h
index 3ca1dd7c4f..3c63cf0ec1 100644
--- a/src/call_reply.h
+++ b/src/call_reply.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2021, Redis Labs Ltd.
+ * Copyright (c) 2009-2021, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/childinfo.c b/src/childinfo.c
index 19a5fa045c..f9a90a23cc 100644
--- a/src/childinfo.c
+++ b/src/childinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/cli_common.c b/src/cli_common.c
index 24d796de67..01d20ed4ea 100644
--- a/src/cli_common.c
+++ b/src/cli_common.c
@@ -1,6 +1,6 @@
 /* CLI (command line interface) common methods
  *
- * Copyright (c) 2020, Redis Labs
+ * Copyright (c) 2020, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/cluster.c b/src/cluster.c
index 162004d703..ced7668d65 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/cluster_legacy.c b/src/cluster_legacy.c
index b35b0b3b8e..4f4e826989 100644
--- a/src/cluster_legacy.c
+++ b/src/cluster_legacy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/config.c b/src/config.c
index afac82be6d..37413c3a86 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,6 +1,6 @@
 /* Configuration file parsing and CONFIG GET/SET commands implementation.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/config.h b/src/config.h
index 201e421976..8d19fa9f7f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/connection.h b/src/connection.h
index d59f7bc7fc..0762441732 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2019, Redis Labs
+ * Copyright (c) 2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/connhelpers.h b/src/connhelpers.h
index b543f2ed2d..ae3fb1508e 100644
--- a/src/connhelpers.h
+++ b/src/connhelpers.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2019, Redis Labs
+ * Copyright (c) 2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/crc16.c b/src/crc16.c
index 7b8c1dad0a..2153177578 100644
--- a/src/crc16.c
+++ b/src/crc16.c
@@ -2,7 +2,7 @@
 
 /*
  * Copyright 2001-2010 Georges Menie (www.menie.org)
- * Copyright 2010-2012 Salvatore Sanfilippo (adapted to Redis coding style)
+ * Copyright 2010-2012 Redis Ltd. (adapted to Redis coding style)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/db.c b/src/db.c
index d0a6640f57..4a2c0a495e 100644
--- a/src/db.c
+++ b/src/db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/debug.c b/src/debug.c
index 27bc481767..27c4d804ac 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2009-2020, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2020, Redis Labs, Inc
+ * Copyright (c) 2009-2020, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/debugmacro.h b/src/debugmacro.h
index 429a230226..7113367cef 100644
--- a/src/debugmacro.h
+++ b/src/debugmacro.h
@@ -2,7 +2,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/defrag.c b/src/defrag.c
index 5a54875864..4d34009f8b 100644
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -5,7 +5,7 @@
  * We do that by scanning the keyspace and for each pointer we have, we can try to
  * ask the allocator if moving it to a new address will help reduce fragmentation.
  *
- * Copyright (c) 2020, Redis Labs, Inc
+ * Copyright (c) 2020, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dict.c b/src/dict.c
index 2eb3dd386f..1df03f6546 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -5,7 +5,7 @@
  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *
- * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/dict.h b/src/dict.h
index 97a79910cb..5fd15004b8 100644
--- a/src/dict.h
+++ b/src/dict.h
@@ -5,7 +5,7 @@
  * tables of power of two in size are used, collisions are handled by
  * chaining. See the source code for more information... :)
  *
- * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/endianconv.c b/src/endianconv.c
index de91671565..15b6bb322a 100644
--- a/src/endianconv.c
+++ b/src/endianconv.c
@@ -13,7 +13,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2011-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2011-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/endianconv.h b/src/endianconv.h
index 062c3f2f53..3faa82b38f 100644
--- a/src/endianconv.h
+++ b/src/endianconv.h
@@ -2,7 +2,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2011-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2011-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/eval.c b/src/eval.c
index 2afbf445f5..f99bff6552 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/evict.c b/src/evict.c
index fb04616871..4b9f70eaa5 100644
--- a/src/evict.c
+++ b/src/evict.c
@@ -2,7 +2,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2009-2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/expire.c b/src/expire.c
index 05abb9580a..a9842ae123 100644
--- a/src/expire.c
+++ b/src/expire.c
@@ -2,7 +2,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2009-2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/fmacros.h b/src/fmacros.h
index d54bdf2d94..78efcdb71f 100644
--- a/src/fmacros.h
+++ b/src/fmacros.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/geo.c b/src/geo.c
index 64eaa3bd63..9e43a6e93b 100644
--- a/src/geo.c
+++ b/src/geo.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, Matt Stancliff <matt@genges.com>.
- * Copyright (c) 2015-2016, Salvatore Sanfilippo <antirez@gmail.com>.
+ * Copyright (c) 2015-2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/geohash.c b/src/geohash.c
index d75e21e4e5..138fd2759a 100644
--- a/src/geohash.c
+++ b/src/geohash.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2013-2014, yinqiwen <yinqiwen@gmail.com>
  * Copyright (c) 2014, Matt Stancliff <matt@genges.com>.
- * Copyright (c) 2015-2016, Salvatore Sanfilippo <antirez@gmail.com>.
+ * Copyright (c) 2015-2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/geohash.h b/src/geohash.h
index b7d185b724..5ae9d78f74 100644
--- a/src/geohash.h
+++ b/src/geohash.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2013-2014, yinqiwen <yinqiwen@gmail.com>
  * Copyright (c) 2014, Matt Stancliff <matt@genges.com>.
- * Copyright (c) 2015, Salvatore Sanfilippo <antirez@gmail.com>.
+ * Copyright (c) 2015, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/geohash_helper.c b/src/geohash_helper.c
index eb7ab9a8ec..aa4b4743a6 100644
--- a/src/geohash_helper.c
+++ b/src/geohash_helper.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2013-2014, yinqiwen <yinqiwen@gmail.com>
  * Copyright (c) 2014, Matt Stancliff <matt@genges.com>.
- * Copyright (c) 2015-2016, Salvatore Sanfilippo <antirez@gmail.com>.
+ * Copyright (c) 2015-2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/geohash_helper.h b/src/geohash_helper.h
index fbca4dda9b..fa95df85e9 100644
--- a/src/geohash_helper.h
+++ b/src/geohash_helper.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2013-2014, yinqiwen <yinqiwen@gmail.com>
  * Copyright (c) 2014, Matt Stancliff <matt@genges.com>.
- * Copyright (c) 2015, Salvatore Sanfilippo <antirez@gmail.com>.
+ * Copyright (c) 2015, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/hyperloglog.c b/src/hyperloglog.c
index 08df8f6a74..9769533d5e 100644
--- a/src/hyperloglog.c
+++ b/src/hyperloglog.c
@@ -1,7 +1,7 @@
 /* hyperloglog.c - HyperLogLog probabilistic cardinality approximation.
  * This file implements the algorithm and the exported commands.
  *
- * Copyright (c) 2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2014, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/intset.c b/src/intset.c
index ae3b796fd1..ddddae221d 100644
--- a/src/intset.c
+++ b/src/intset.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2009-2012, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/intset.h b/src/intset.h
index 52d215ab0f..c727ee3f83 100644
--- a/src/intset.h
+++ b/src/intset.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2009-2012, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/latency.c b/src/latency.c
index eacb5fbbc4..49203ce768 100644
--- a/src/latency.c
+++ b/src/latency.c
@@ -5,7 +5,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2014, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/latency.h b/src/latency.h
index 4b1e291895..ed8beee7af 100644
--- a/src/latency.h
+++ b/src/latency.h
@@ -3,7 +3,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2014, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2014, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/listpack.c b/src/listpack.c
index be970e1e64..3bb6686f61 100644
--- a/src/listpack.c
+++ b/src/listpack.c
@@ -4,8 +4,7 @@
  *
  *  https://github.com/antirez/listpack
  *
- * Copyright (c) 2017, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2020, Redis Labs, Inc
+ * Copyright (c) 2017,2020, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -167,7 +166,7 @@ int lpSafeToAdd(unsigned char *lp, size_t add) {
  * "utils.c", function string2ll(), and is copyright:
  *
  * Copyright(C) 2011, Pieter Noordhuis
- * Copyright(C) 2011, Salvatore Sanfilippo
+ * Copyright(C) 2011, Redis Ltd.
  *
  * The function is released under the BSD 3-clause license.
  */
diff --git a/src/listpack.h b/src/listpack.h
index 7934905c6e..1f99b59457 100644
--- a/src/listpack.h
+++ b/src/listpack.h
@@ -4,7 +4,7 @@
  *
  *  https://github.com/antirez/listpack
  *
- * Copyright (c) 2017, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2017, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/listpack_malloc.h b/src/listpack_malloc.h
index 0d36bb19d5..a75bd31817 100644
--- a/src/listpack_malloc.h
+++ b/src/listpack_malloc.h
@@ -1,7 +1,7 @@
 /* Listpack -- A lists of strings serialization format
  * https://github.com/antirez/listpack
  *
- * Copyright (c) 2017, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2017, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/localtime.c b/src/localtime.c
index 55037de103..797b13a543 100644
--- a/src/localtime.c
+++ b/src/localtime.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2018, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/lolwut.c b/src/lolwut.c
index 7862e5c9fd..d4b7031873 100644
--- a/src/lolwut.c
+++ b/src/lolwut.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2018, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/lolwut.h b/src/lolwut.h
index 682d00531f..77bf05dafb 100644
--- a/src/lolwut.h
+++ b/src/lolwut.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2018-2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/lolwut5.c b/src/lolwut5.c
index d1405d88e5..0dfe35642b 100644
--- a/src/lolwut5.c
+++ b/src/lolwut5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2018, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/lolwut6.c b/src/lolwut6.c
index a743fb20c3..1ed3683cf7 100644
--- a/src/lolwut6.c
+++ b/src/lolwut6.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/memtest.c b/src/memtest.c
index 4439baae26..c071cfdfdf 100644
--- a/src/memtest.c
+++ b/src/memtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/module.c b/src/module.c
index 5eb5c3ac84..e45b8f4181 100644
--- a/src/module.c
+++ b/src/module.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/modules/helloblock.c b/src/modules/helloblock.c
index 65e9bb71a2..61c848b413 100644
--- a/src/modules/helloblock.c
+++ b/src/modules/helloblock.c
@@ -3,7 +3,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/modules/hellocluster.c b/src/modules/hellocluster.c
index cfc0d4f0f4..b5c96ed256 100644
--- a/src/modules/hellocluster.c
+++ b/src/modules/hellocluster.c
@@ -2,7 +2,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2018, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2018, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/modules/hellodict.c b/src/modules/hellodict.c
index 38081919f3..e0af06ba2f 100644
--- a/src/modules/hellodict.c
+++ b/src/modules/hellodict.c
@@ -5,7 +5,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2018, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2018, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/modules/hellohook.c b/src/modules/hellohook.c
index 35a1ed0a1a..c655800aa9 100644
--- a/src/modules/hellohook.c
+++ b/src/modules/hellohook.c
@@ -2,7 +2,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2019, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/modules/hellotimer.c b/src/modules/hellotimer.c
index 40ba323e58..3d6258c76a 100644
--- a/src/modules/hellotimer.c
+++ b/src/modules/hellotimer.c
@@ -2,7 +2,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2018, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2018, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/modules/hellotype.c b/src/modules/hellotype.c
index 7e2dc60c68..53dc75c864 100644
--- a/src/modules/hellotype.c
+++ b/src/modules/hellotype.c
@@ -7,7 +7,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/modules/helloworld.c b/src/modules/helloworld.c
index f74e4e9b66..83f36615ad 100644
--- a/src/modules/helloworld.c
+++ b/src/modules/helloworld.c
@@ -6,7 +6,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/multi.c b/src/multi.c
index 074060269c..14688f80b4 100644
--- a/src/multi.c
+++ b/src/multi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/networking.c b/src/networking.c
index aec03c29cf..8b69743530 100644
--- a/src/networking.c
+++ b/src/networking.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/notify.c b/src/notify.c
index 1cbf9c74ed..5305f24664 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2013, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/object.c b/src/object.c
index 6e5d1f460b..73382ffe8b 100644
--- a/src/object.c
+++ b/src/object.c
@@ -1,6 +1,6 @@
 /* Object implementation.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/pqsort.c b/src/pqsort.c
index ca4f99359d..31729cfbec 100644
--- a/src/pqsort.c
+++ b/src/pqsort.c
@@ -1,7 +1,7 @@
 /* The following is the NetBSD libc qsort implementation modified in order to
  * support partial sorting of ranges.
  *
- * Copyright(C) 2009-2012 Salvatore Sanfilippo. All rights reserved.
+ * Copyright(C) 2009-2012 Redis Ltd.
  *
  * The original copyright notice follows. */
 
diff --git a/src/pqsort.h b/src/pqsort.h
index 5f1c5c1cd3..84f98f8626 100644
--- a/src/pqsort.h
+++ b/src/pqsort.h
@@ -1,7 +1,7 @@
 /* The following is the NetBSD libc qsort implementation modified in order to
  * support partial sorting of ranges.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/pubsub.c b/src/pubsub.c
index eacadfc185..047d408621 100644
--- a/src/pubsub.c
+++ b/src/pubsub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rand.c b/src/rand.c
index 6f3d0c49d7..cceb644cee 100644
--- a/src/rand.c
+++ b/src/rand.c
@@ -13,7 +13,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2010-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rand.h b/src/rand.h
index 2726c92b7f..dec7465084 100644
--- a/src/rand.h
+++ b/src/rand.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rax.c b/src/rax.c
index cee9b714e5..909d5a2375 100644
--- a/src/rax.c
+++ b/src/rax.c
@@ -2,7 +2,7 @@
  *
  * Version 1.2 -- 7 February 2019
  *
- * Copyright (c) 2017-2019, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2017-2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rax.h b/src/rax.h
index c03e0303a0..3e3a85e783 100644
--- a/src/rax.h
+++ b/src/rax.h
@@ -1,6 +1,6 @@
 /* Rax -- A radix tree implementation.
  *
- * Copyright (c) 2017-2018, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2017-2018, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rax_malloc.h b/src/rax_malloc.h
index 9295985c65..03c952e1a4 100644
--- a/src/rax_malloc.h
+++ b/src/rax_malloc.h
@@ -1,6 +1,6 @@
 /* Rax -- A radix tree implementation.
  *
- * Copyright (c) 2017, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2017, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rdb.c b/src/rdb.c
index 32b5210ca4..bc2d03e86c 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rdb.h b/src/rdb.h
index 3b17cbe9de..8f05a0ea1e 100644
--- a/src/rdb.h
+++ b/src/rdb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/release.c b/src/release.c
index a5a16f24f4..0afa1144dc 100644
--- a/src/release.c
+++ b/src/release.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/replication.c b/src/replication.c
index 8b751d3a7a..194434bf9f 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -1,6 +1,6 @@
 /* Asynchronous replication implementation.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/resp_parser.c b/src/resp_parser.c
index 326766fc22..950d2227b7 100644
--- a/src/resp_parser.c
+++ b/src/resp_parser.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2021, Redis Labs Ltd.
+ * Copyright (c) 2009-2021, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/resp_parser.h b/src/resp_parser.h
index a099fa8a7d..1ff08f2734 100644
--- a/src/resp_parser.h
+++ b/src/resp_parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Redis Labs Ltd.
+ * Copyright (c) 2021, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rio.c b/src/rio.c
index 5f8ae61a4e..b47f4c2c13 100644
--- a/src/rio.c
+++ b/src/rio.c
@@ -16,7 +16,7 @@
  * ----------------------------------------------------------------------------
  *
  * Copyright (c) 2009-2012, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/rio.h b/src/rio.h
index 698dcb66d1..ee0f27aa7e 100644
--- a/src/rio.h
+++ b/src/rio.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2009-2012, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2009-2019, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/sds.c b/src/sds.c
index ba3362e88a..9878a6bf85 100644
--- a/src/sds.c
+++ b/src/sds.c
@@ -1,8 +1,7 @@
 /* SDSLib 2.0 -- A C dynamic strings library
  *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2015, Redis Ltd.
  * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/sds.h b/src/sds.h
index a12b8dd89e..e9c4a95f9a 100644
--- a/src/sds.h
+++ b/src/sds.h
@@ -1,8 +1,7 @@
 /* SDSLib 2.0 -- A C dynamic strings library
  *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2015, Redis Ltd.
  * Copyright (c) 2015, Oran Agra
- * Copyright (c) 2015, Redis Labs, Inc
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/sdsalloc.h b/src/sdsalloc.h
index dfa8257ebd..19236af722 100644
--- a/src/sdsalloc.h
+++ b/src/sdsalloc.h
@@ -1,7 +1,6 @@
 /* SDSLib 2.0 -- A C dynamic strings library
  *
- * Copyright (c) 2006-2015, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2015, Redis Labs, Inc
+ * Copyright (c) 2006-2015, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/sentinel.c b/src/sentinel.c
index 7eee2562cc..3e2c83a712 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -1,6 +1,6 @@
 /* Sentinel implementation
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/server.c b/src/server.c
index 3cd9ec3d9f..c707699e6e 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/server.h b/src/server.h
index f7a2960e5d..49d0a4485a 100644
--- a/src/server.h
+++ b/src/server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/serverassert.c b/src/serverassert.c
index 74a2b21fb2..1364cf700f 100644
--- a/src/serverassert.c
+++ b/src/serverassert.c
@@ -6,7 +6,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2021, Andy Pan <panjf2000@gmail.com> and Redis Labs
+ * Copyright (c) 2021, Andy Pan <panjf2000@gmail.com> and Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/serverassert.h b/src/serverassert.h
index e257c854fb..02fbcd85b7 100644
--- a/src/serverassert.h
+++ b/src/serverassert.h
@@ -7,7 +7,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2006-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/setproctitle.c b/src/setproctitle.c
index 019402348b..d65274625a 100644
--- a/src/setproctitle.c
+++ b/src/setproctitle.c
@@ -2,7 +2,7 @@
  * setproctitle.c - Linux/Darwin setproctitle.
  * --------------------------------------------------------------------------
  * Copyright (C) 2010  William Ahern
- * Copyright (C) 2013  Salvatore Sanfilippo
+ * Copyright (C) 2013  Redis Ltd.
  * Copyright (C) 2013  Stam He
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/siphash.c b/src/siphash.c
index a62d5c0616..7527176218 100644
--- a/src/siphash.c
+++ b/src/siphash.c
@@ -4,7 +4,7 @@
    Copyright (c) 2012-2016 Jean-Philippe Aumasson
    <jeanphilippe.aumasson@gmail.com>
    Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
-   Copyright (c) 2017 Salvatore Sanfilippo <antirez@gmail.com>
+   Copyright (c) 2017 Redis Ltd.
 
    To the extent possible under law, the author(s) have dedicated all copyright
    and related and neighboring rights to this software to the public domain
@@ -16,7 +16,7 @@
 
    ----------------------------------------------------------------------------
 
-   This version was modified by Salvatore Sanfilippo <antirez@gmail.com>
+   This version was modified by Redis Ltd.
    in the following ways:
 
    1. We use SipHash 1-2. This is not believed to be as strong as the
diff --git a/src/slowlog.c b/src/slowlog.c
index 2bf8e0185e..68abaf8058 100644
--- a/src/slowlog.c
+++ b/src/slowlog.c
@@ -10,7 +10,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/slowlog.h b/src/slowlog.h
index 2372b9f6ea..12d9097ffa 100644
--- a/src/slowlog.h
+++ b/src/slowlog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/socket.c b/src/socket.c
index b2f8f1aaec..295569da00 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Redis Labs
+ * Copyright (c) 2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/solarisfixes.h b/src/solarisfixes.h
index b68e34b968..a1473a9423 100644
--- a/src/solarisfixes.h
+++ b/src/solarisfixes.h
@@ -1,6 +1,6 @@
 /* Solaris specific fixes.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/sort.c b/src/sort.c
index bad86add3b..f027b0c321 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -1,6 +1,6 @@
 /* SORT command and helper functions.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/sparkline.c b/src/sparkline.c
index f51eeb2a86..c5ff695d45 100644
--- a/src/sparkline.c
+++ b/src/sparkline.c
@@ -5,7 +5,7 @@
  *
  * ---------------------------------------------------------------------------
  *
- * Copyright(C) 2011-2014 Salvatore Sanfilippo <antirez@gmail.com>
+ * Copyright(C) 2011-2014 Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/sparkline.h b/src/sparkline.h
index 6025d2b98b..1db94ba47a 100644
--- a/src/sparkline.h
+++ b/src/sparkline.h
@@ -2,7 +2,7 @@
  *
  * ---------------------------------------------------------------------------
  *
- * Copyright(C) 2011-2014 Salvatore Sanfilippo <antirez@gmail.com>
+ * Copyright(C) 2011-2014 Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/syncio.c b/src/syncio.c
index 427d279d4c..63e9444ff8 100644
--- a/src/syncio.c
+++ b/src/syncio.c
@@ -1,6 +1,6 @@
 /* Synchronous socket and file I/O operations useful across the core.
  *
- * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/syscheck.c b/src/syscheck.c
index 3c6252d846..d66e7f0e19 100644
--- a/src/syscheck.c
+++ b/src/syscheck.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2022, Redis Ltd.
- * Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2016, 2022, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/t_hash.c b/src/t_hash.c
index ae4c499f9d..9398dc3e3f 100644
--- a/src/t_hash.c
+++ b/src/t_hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/t_list.c b/src/t_list.c
index 845666b13c..f5df563e40 100644
--- a/src/t_list.c
+++ b/src/t_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/t_set.c b/src/t_set.c
index 53ab37be03..b2aeec52e7 100644
--- a/src/t_set.c
+++ b/src/t_set.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/t_stream.c b/src/t_stream.c
index d2a45dde06..12eb78067d 100644
--- a/src/t_stream.c
+++ b/src/t_stream.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2017, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/t_string.c b/src/t_string.c
index 19e19cf5d5..6e233e0959 100644
--- a/src/t_string.c
+++ b/src/t_string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/t_zset.c b/src/t_zset.c
index 97b2c071f1..029acde4fa 100644
--- a/src/t_zset.c
+++ b/src/t_zset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * Copyright (c) 2009-2012, Pieter Noordhuis <pcnoordhuis at gmail dot com>
  * All rights reserved.
  *
diff --git a/src/testhelp.h b/src/testhelp.h
index 07c88cecd8..9acfb7b0e1 100644
--- a/src/testhelp.h
+++ b/src/testhelp.h
@@ -8,7 +8,7 @@
  *
  * ----------------------------------------------------------------------------
  *
- * Copyright (c) 2010-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/timeout.c b/src/timeout.c
index 3084edf7f3..f5534e7e71 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2020, Salvatore Sanfilippo <antirez at gmail dot com>
+/* Copyright (c) 2009-2020, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tls.c b/src/tls.c
index 1913d876fa..7b57fce6f4 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Redis Labs
+ * Copyright (c) 2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/tracking.c b/src/tracking.c
index 62d6121cfd..de1b34d850 100644
--- a/src/tracking.c
+++ b/src/tracking.c
@@ -1,6 +1,6 @@
 /* tracking.c - Client side caching: keys tracking and invalidation
  *
- * Copyright (c) 2019, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/util.c b/src/util.c
index 0d96cac6c3..66f62c9001 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * Copyright (c) 2012, Twitter, Inc.
  * All rights reserved.
  *
diff --git a/src/util.h b/src/util.h
index d675f4c6cd..51eb38f0b4 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/valkey-benchmark.c b/src/valkey-benchmark.c
index 5fe707510f..cccc872cd1 100644
--- a/src/valkey-benchmark.c
+++ b/src/valkey-benchmark.c
@@ -1,6 +1,6 @@
 /* Server benchmark utility.
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/valkey-check-aof.c b/src/valkey-check-aof.c
index d3ebfb348c..bc71d366d5 100644
--- a/src/valkey-check-aof.c
+++ b/src/valkey-check-aof.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2009-2012, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/valkey-check-rdb.c b/src/valkey-check-rdb.c
index 0b2fdbb666..cab6b2a414 100644
--- a/src/valkey-check-rdb.c
+++ b/src/valkey-check-rdb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/valkey-cli.c b/src/valkey-cli.c
index 165a932961..87ff865eaf 100644
--- a/src/valkey-cli.c
+++ b/src/valkey-cli.c
@@ -1,6 +1,6 @@
 /* Server CLI (command line interface)
  *
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ziplist.c b/src/ziplist.c
index 30efdc6573..820d5e499f 100644
--- a/src/ziplist.c
+++ b/src/ziplist.c
@@ -151,8 +151,7 @@
  * ----------------------------------------------------------------------------
  *
  * Copyright (c) 2009-2012, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2009-2017, Salvatore Sanfilippo <antirez at gmail dot com>
- * Copyright (c) 2020, Redis Labs, Inc
+ * Copyright (c) 2009-2017, 2020, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/ziplist.h b/src/ziplist.h
index d6f41af338..a839c66c60 100644
--- a/src/ziplist.h
+++ b/src/ziplist.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2009-2012, Pieter Noordhuis <pcnoordhuis at gmail dot com>
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2012, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/zipmap.c b/src/zipmap.c
index 4498a34528..25d8ab8465 100644
--- a/src/zipmap.c
+++ b/src/zipmap.c
@@ -12,7 +12,7 @@
  *
  * --------------------------------------------------------------------------
  *
- * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/zipmap.h b/src/zipmap.h
index 3fd1ee0778..0112ac2b1f 100644
--- a/src/zipmap.h
+++ b/src/zipmap.h
@@ -4,7 +4,7 @@
  *
  * --------------------------------------------------------------------------
  *
- * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/zmalloc.c b/src/zmalloc.c
index afee8e07a0..7b19107b66 100644
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
@@ -1,6 +1,6 @@
 /* zmalloc - total amount of allocated memory aware version of malloc()
  *
- * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/zmalloc.h b/src/zmalloc.h
index 421cb9bcaa..f389b905c0 100644
--- a/src/zmalloc.h
+++ b/src/zmalloc.h
@@ -1,6 +1,6 @@
 /* zmalloc - total amount of allocated memory aware version of malloc()
  *
- * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2009-2010, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/cluster/cluster.tcl b/tests/cluster/cluster.tcl
index 0080501bf4..72a187e784 100644
--- a/tests/cluster/cluster.tcl
+++ b/tests/cluster/cluster.tcl
@@ -1,6 +1,6 @@
 # Cluster-specific test functions.
 #
-# Copyright (C) 2014 Salvatore Sanfilippo antirez@gmail.com
+# Copyright (C) 2014 Redis Ltd.
 # This software is released under the BSD License. See the COPYING file for
 # more information.
 
diff --git a/tests/cluster/run.tcl b/tests/cluster/run.tcl
index 710b123fac..d29f17db7d 100644
--- a/tests/cluster/run.tcl
+++ b/tests/cluster/run.tcl
@@ -1,4 +1,4 @@
-# Cluster test suite. Copyright (C) 2014 Salvatore Sanfilippo antirez@gmail.com
+# Cluster test suite. Copyright (C) 2014 Redis Ltd.
 # This software is released under the BSD License. See the COPYING file for
 # more information.
 
diff --git a/tests/instances.tcl b/tests/instances.tcl
index 782804ddae..661281c995 100644
--- a/tests/instances.tcl
+++ b/tests/instances.tcl
@@ -3,7 +3,7 @@
 # basic capabilities for spawning and handling N parallel Server / Sentinel
 # instances.
 #
-# Copyright (C) 2014 Salvatore Sanfilippo antirez@gmail.com
+# Copyright (C) 2014 Redis Ltd.
 # This software is released under the BSD License. See the COPYING file for
 # more information.
 
diff --git a/tests/modules/basics.c b/tests/modules/basics.c
index eda0fdb899..36f88becbe 100644
--- a/tests/modules/basics.c
+++ b/tests/modules/basics.c
@@ -2,7 +2,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2016, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2016, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/modules/hooks.c b/tests/modules/hooks.c
index 72e2f40ff0..ef63846669 100644
--- a/tests/modules/hooks.c
+++ b/tests/modules/hooks.c
@@ -2,7 +2,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2019, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/modules/propagate.c b/tests/modules/propagate.c
index bd7f1987ba..b3cd279e5a 100644
--- a/tests/modules/propagate.c
+++ b/tests/modules/propagate.c
@@ -9,7 +9,7 @@
  *
  * -----------------------------------------------------------------------------
  *
- * Copyright (c) 2019, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2019, Redis Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/tests/sentinel/run.tcl b/tests/sentinel/run.tcl
index d5471e13e0..9cbb189bed 100644
--- a/tests/sentinel/run.tcl
+++ b/tests/sentinel/run.tcl
@@ -1,4 +1,4 @@
-# Sentinel test suite. Copyright (C) 2014 Salvatore Sanfilippo antirez@gmail.com
+# Sentinel test suite. Copyright (C) 2014 Redis Ltd.
 # This software is released under the BSD License. See the COPYING file for
 # more information.
 
diff --git a/tests/support/cluster.tcl b/tests/support/cluster.tcl
index 2b9e44f64f..e9a5395be5 100644
--- a/tests/support/cluster.tcl
+++ b/tests/support/cluster.tcl
@@ -1,5 +1,5 @@
 # Tcl cluster client as a wrapper of redis.rb.
-# Copyright (C) 2014 Salvatore Sanfilippo
+# Copyright (c) 2014 Redis Ltd.
 # Released under the BSD license like Redis itself
 #
 # Example usage:
diff --git a/tests/support/valkey.tcl b/tests/support/valkey.tcl
index 6f8727ace8..a5d1e2ca0a 100644
--- a/tests/support/valkey.tcl
+++ b/tests/support/valkey.tcl
@@ -1,5 +1,5 @@
 # Tcl client library - used by the server test
-# Copyright (C) 2009-2014 Salvatore Sanfilippo
+# Copyright (c) 2009-2014 Redis Ltd.
 # Released under the BSD license like Redis itself
 #
 # Example usage:
diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index ae784271c9..89bbfae649 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -1,4 +1,4 @@
-# Server test suite. Copyright (C) 2009 Salvatore Sanfilippo antirez@gmail.com
+# Server test suite. Copyright (C) 2009 Redis Ltd.
 # This software is released under the BSD License. See the COPYING file for
 # more information.
 
diff --git a/utils/build-static-symbols.tcl b/utils/build-static-symbols.tcl
index 0aa8f72402..966c827405 100644
--- a/utils/build-static-symbols.tcl
+++ b/utils/build-static-symbols.tcl
@@ -2,7 +2,7 @@
 # Useful to get stack traces on segfault without a debugger. See redis.c
 # for more information.
 #
-# Copyright(C) 2009 Salvatore Sanfilippo, under the BSD license.
+# Copyright(C) 2009 Redis Ltd.
 
 set fd [open redis.c]
 set symlist {}
diff --git a/utils/corrupt_rdb.c b/utils/corrupt_rdb.c
index df9c93ed88..5f35efb95c 100644
--- a/utils/corrupt_rdb.c
+++ b/utils/corrupt_rdb.c
@@ -1,7 +1,7 @@
 /* Trivia program to corrupt an RDB file in order to check the RDB check
  * program behavior and effectiveness.
  *
- * Copyright (C) 2016 Salvatore Sanfilippo.
+ * Copyright (C) 2016 Redis ltd.
  * This software is released in the 3-clause BSD license. */
 
 #include <stdio.h>
diff --git a/utils/hyperloglog/hll-err.rb b/utils/hyperloglog/hll-err.rb
index e04cf93800..8c5b59fdd1 100644
--- a/utils/hyperloglog/hll-err.rb
+++ b/utils/hyperloglog/hll-err.rb
@@ -1,4 +1,4 @@
-# hll-err.rb - Copyright (C) 2014 Salvatore Sanfilippo
+# hll-err.rb - Copyright (C) 2014 Redis Ltd.
 # BSD license, See the COPYING file for more information.
 #
 # Check error of HyperLogLog implementation for different set sizes.
diff --git a/utils/hyperloglog/hll-gnuplot-graph.rb b/utils/hyperloglog/hll-gnuplot-graph.rb
index 61f0672637..8b2cbd48ed 100644
--- a/utils/hyperloglog/hll-gnuplot-graph.rb
+++ b/utils/hyperloglog/hll-gnuplot-graph.rb
@@ -1,4 +1,4 @@
-# hll-err.rb - Copyright (C) 2014 Salvatore Sanfilippo
+# hll-err.rb - Copyright (C) 2014 Redis Ltd.
 # BSD license, See the COPYING file for more information.
 #
 # This program is suited to output average and maximum errors of
diff --git a/utils/redis-copy.rb b/utils/redis-copy.rb
index 9f8335c341..c5e2b59fe1 100644
--- a/utils/redis-copy.rb
+++ b/utils/redis-copy.rb
@@ -1,4 +1,4 @@
-# redis-copy.rb - Copyright (C) 2009-2010 Salvatore Sanfilippo
+# redis-copy.rb - Copyright (C) 2009-2010 Redis Ltd.
 # BSD license, See the COPYING file for more information.
 #
 # Copy the whole dataset from one server instance to another one
diff --git a/utils/redis-sha1.rb b/utils/redis-sha1.rb
index 6a8b4f3586..43e8580bbd 100644
--- a/utils/redis-sha1.rb
+++ b/utils/redis-sha1.rb
@@ -1,4 +1,4 @@
-# redis-sha1.rb - Copyright (C) 2009 Salvatore Sanfilippo
+# redis-sha1.rb - Copyright (C) 2009 Redis Ltd.
 # BSD license, See the COPYING file for more information.
 #
 # Performs the SHA1 sum of the whole dataset.
diff --git a/utils/speed-regression.tcl b/utils/speed-regression.tcl
index 2a4ecde452..b51d910869 100755
--- a/utils/speed-regression.tcl
+++ b/utils/speed-regression.tcl
@@ -1,5 +1,5 @@
 #!/usr/bin/env tclsh8.5
-# Copyright (C) 2011 Salvatore Sanfilippo
+# Copyright (C) 2011 Redis Ltd.
 # Released under the BSD license like Redis itself
 
 source ../tests/support/valkey.tcl
diff --git a/utils/tracking_collisions.c b/utils/tracking_collisions.c
index 4df3e84af5..b7c7b77bf1 100644
--- a/utils/tracking_collisions.c
+++ b/utils/tracking_collisions.c
@@ -17,7 +17,7 @@
  *
  * --------------------------------------------------------------------------
  *
- * Copyright (C) 2019 Salvatore Sanfilippo
+ * Copyright (C) 2019 Redis Ltd.
  * This code is released under the BSD 2 clause license.
  */