diff --git a/src/Makefile b/src/Makefile
index e8d6fcca3..83255feee 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -362,9 +362,9 @@ SERVER_NAME=$(ENGINE_NAME)-server$(PROG_SUFFIX)
 ENGINE_SENTINEL_NAME=$(ENGINE_NAME)-sentinel$(PROG_SUFFIX)
 ENGINE_SERVER_OBJ=threads_mngr.o adlist.o quicklist.o ae.o anet.o dict.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o
 ENGINE_CLI_NAME=$(ENGINE_NAME)-cli$(PROG_SUFFIX)
-ENGINE_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o
+ENGINE_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o serverassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o
 ENGINE_BENCHMARK_NAME=$(ENGINE_NAME)-benchmark$(PROG_SUFFIX)
-ENGINE_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adlist.o dict.o zmalloc.o redisassert.o release.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o
+ENGINE_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adlist.o dict.o zmalloc.o serverassert.o release.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o
 ENGINE_CHECK_RDB_NAME=$(ENGINE_NAME)-check-rdb$(PROG_SUFFIX)
 ENGINE_CHECK_AOF_NAME=$(ENGINE_NAME)-check-aof$(PROG_SUFFIX)
 ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(ENGINE_SERVER_OBJ) $(ENGINE_CLI_OBJ) $(ENGINE_BENCHMARK_OBJ)))
diff --git a/src/ae.c b/src/ae.c
index 99c0b8600..839d23b51 100644
--- a/src/ae.c
+++ b/src/ae.c
@@ -32,7 +32,7 @@
 
 #include "ae.h"
 #include "anet.h"
-#include "redisassert.h"
+#include "serverassert.h"
 
 #include <stdio.h>
 #include <sys/time.h>
diff --git a/src/dict.c b/src/dict.c
index 7e584f079..d2767939b 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -45,7 +45,7 @@
 
 #include "dict.h"
 #include "zmalloc.h"
-#include "redisassert.h"
+#include "serverassert.h"
 #include "monotonic.h"
 
 /* Using dictSetResizeEnabled() we make possible to disable
diff --git a/src/intset.c b/src/intset.c
index 221278fc4..fea4173b4 100644
--- a/src/intset.c
+++ b/src/intset.c
@@ -34,7 +34,7 @@
 #include "intset.h"
 #include "zmalloc.h"
 #include "endianconv.h"
-#include "redisassert.h"
+#include "serverassert.h"
 
 /* Note that these encodings are ordered, so:
  * INTSET_ENC_INT16 < INTSET_ENC_INT32 < INTSET_ENC_INT64. */
diff --git a/src/kvstore.c b/src/kvstore.c
index 1195db67b..acfe62bb8 100644
--- a/src/kvstore.c
+++ b/src/kvstore.c
@@ -43,7 +43,7 @@
 
 #include "zmalloc.h"
 #include "kvstore.h"
-#include "redisassert.h"
+#include "serverassert.h"
 #include "monotonic.h"
 
 #define UNUSED(V) ((void) V)
diff --git a/src/listpack.c b/src/listpack.c
index 470a8f992..27becc9fa 100644
--- a/src/listpack.c
+++ b/src/listpack.c
@@ -42,7 +42,7 @@
 
 #include "listpack.h"
 #include "listpack_malloc.h"
-#include "redisassert.h"
+#include "serverassert.h"
 #include "util.h"
 
 #define LP_HDR_SIZE 6       /* 32 bit total len + 16 bit number of elements. */
diff --git a/src/memtest.c b/src/memtest.c
index ee1ba92f1..47e65a904 100644
--- a/src/memtest.c
+++ b/src/memtest.c
@@ -38,7 +38,7 @@
 #include <stropts.h>
 #endif
 #include "config.h"
-#include "redisassert.h"
+#include "serverassert.h"
 
 #if (ULONG_MAX == 4294967295UL)
 #define MEMTEST_32BIT
diff --git a/src/monotonic.c b/src/monotonic.c
index 6da03677b..e55b5eb0c 100644
--- a/src/monotonic.c
+++ b/src/monotonic.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
-#include "redisassert.h"
+#include "serverassert.h"
 
 /* The function pointer for clock retrieval.  */
 monotime (*getMonotonicUs)(void) = NULL;
diff --git a/src/quicklist.c b/src/quicklist.c
index b9f691170..06c699af6 100644
--- a/src/quicklist.c
+++ b/src/quicklist.c
@@ -37,7 +37,7 @@
 #include "listpack.h"
 #include "util.h" /* for ll2string */
 #include "lzf.h"
-#include "redisassert.h"
+#include "serverassert.h"
 
 #ifndef REDIS_STATIC
 #define REDIS_STATIC static
diff --git a/src/rax.c b/src/rax.c
index 100744d79..27a575653 100644
--- a/src/rax.c
+++ b/src/rax.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <math.h>
 #include "rax.h"
-#include "redisassert.h"
+#include "serverassert.h"
 
 #ifndef RAX_MALLOC_INCLUDE
 #define RAX_MALLOC_INCLUDE "rax_malloc.h"
diff --git a/src/sds.c b/src/sds.c
index 84edef97d..b8457ae0f 100644
--- a/src/sds.c
+++ b/src/sds.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
-#include "redisassert.h"
+#include "serverassert.h"
 #include "sds.h"
 #include "sdsalloc.h"
 #include "util.h"
diff --git a/src/redisassert.c b/src/serverassert.c
similarity index 100%
rename from src/redisassert.c
rename to src/serverassert.c
diff --git a/src/redisassert.h b/src/serverassert.h
similarity index 100%
rename from src/redisassert.h
rename to src/serverassert.h
diff --git a/src/ziplist.c b/src/ziplist.c
index 490d5e393..1a1694585 100644
--- a/src/ziplist.c
+++ b/src/ziplist.c
@@ -190,7 +190,7 @@
 #include "ziplist.h"
 #include "config.h"
 #include "endianconv.h"
-#include "redisassert.h"
+#include "serverassert.h"
 
 #define ZIP_END 255         /* Special "end of ziplist" entry. */
 #define ZIP_BIG_PREVLEN 254 /* ZIP_BIG_PREVLEN - 1 is the max number of bytes of
diff --git a/src/zmalloc.c b/src/zmalloc.c
index c1d10a5f0..27b64dc0d 100644
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
@@ -628,7 +628,7 @@ size_t zmalloc_get_rss(void) {
 
 #if defined(USE_JEMALLOC)
 
-#include "redisassert.h"
+#include "serverassert.h"
 
 #define STRINGIFY_(x) #x
 #define STRINGIFY(x) STRINGIFY_(x)
@@ -910,7 +910,7 @@ size_t zmalloc_get_memory_size(void) {
 
 #ifdef SERVER_TEST
 #include "testhelp.h"
-#include "redisassert.h"
+#include "serverassert.h"
 
 #define TEST(name) printf("test — %s\n", name);