diff --git a/src/dict.c b/src/dict.c
index e3ba5189c..8a9227629 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -1809,7 +1809,7 @@ dictType BenchmarkDictType = {
     printf(msg ": %ld items in %lld ms\n", count, elapsed); \
 } while(0)
 
-/* ./redis-server test dict [<count> | --accurate] */
+/* ./valkey-server test dict [<count> | --accurate] */
 int dictTest(int argc, char **argv, int flags) {
     long j;
     long long start, elapsed;
diff --git a/src/kvstore.c b/src/kvstore.c
index b3b166a0a..2f954157b 100644
--- a/src/kvstore.c
+++ b/src/kvstore.c
@@ -903,7 +903,7 @@ char *stringFromInt(int value) {
     return s;
 }
 
-/* ./redis-server test kvstore */
+/* ./valkey-server test kvstore */
 int kvstoreTest(int argc, char **argv, int flags) {
     UNUSED(argc);
     UNUSED(argv);
diff --git a/src/server.c b/src/server.c
index 3fbbd8cea..0864ec7d4 100644
--- a/src/server.c
+++ b/src/server.c
@@ -7052,7 +7052,7 @@ int main(int argc, char **argv) {
                 exit(0);
             } else {
                 fprintf(stderr,"Please specify the amount of memory to test in megabytes.\n");
-                fprintf(stderr,"Example: ./redis-server --test-memory 4096\n\n");
+                fprintf(stderr,"Example: ./valkey-server --test-memory 4096\n\n");
                 exit(1);
             }
         } if (strcmp(argv[1], "--check-system") == 0) {
diff --git a/src/tls.c b/src/tls.c
index ad35ca2c2..956b4b67c 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -1177,7 +1177,7 @@ int ValkeyModule_OnLoad(void *ctx, ValkeyModuleString **argv, int argc) {
 
     /* Connection modules must be part of the same build as the server. */
     if (strcmp(REDIS_BUILD_ID_RAW, serverBuildIdRaw())) {
-        serverLog(LL_NOTICE, "Connection type %s was not built together with the redis-server used.", CONN_TYPE_TLS);
+        serverLog(LL_NOTICE, "Connection type %s was not built together with the valkey-server used.", CONN_TYPE_TLS);
         return VALKEYMODULE_ERR;
     }
 
diff --git a/src/ziplist.c b/src/ziplist.c
index 677fe4423..413b7a8d2 100644
--- a/src/ziplist.c
+++ b/src/ziplist.c
@@ -1845,7 +1845,7 @@ static size_t strEntryBytesLarge(size_t slen) {
     return slen + zipStorePrevEntryLength(NULL, ZIP_BIG_PREVLEN) + zipStoreEntryEncoding(NULL, 0, slen);
 }
 
-/* ./redis-server test ziplist <randomseed> */
+/* ./valkey-server test ziplist <randomseed> */
 int ziplistTest(int argc, char **argv, int flags) {
     int accurate = (flags & TEST_ACCURATE);
     unsigned char *zl, *p;