diff --git a/keydb.conf b/keydb.conf
index c9ffe9396..3874c5acd 100644
--- a/keydb.conf
+++ b/keydb.conf
@@ -718,7 +718,7 @@ replica-priority 100
 #  -<command>   Disallow the execution of that command
 #  +@<category> Allow the execution of all the commands in such category
 #               with valid categories are like @admin, @set, @sortedset, ...
-#               and so forth, see the full list in the server.c file where
+#               and so forth, see the full list in the server.cpp file where
 #               the KeyDB command table is described and defined.
 #               The special category @all means all the commands, but currently
 #               present in the server, and that will be loaded in the future
diff --git a/src/acl.cpp b/src/acl.cpp
index 5440fffb8..b3e6f408a 100644
--- a/src/acl.cpp
+++ b/src/acl.cpp
@@ -723,8 +723,8 @@ void ACLAddAllowedSubcommand(user *u, unsigned long id, const char *sub) {
  * -<command>   Disallow the execution of that command
  * +@<category> Allow the execution of all the commands in such category
  *              with valid categories are like @admin, @set, @sortedset, ...
- *              and so forth, see the full list in the server.c file where
- *              the Redis command table is described and defined.
+ *              and so forth, see the full list in the server.cpp file where
+ *              the KeyDB command table is described and defined.
  *              The special category @all means all the commands, but currently
  *              present in the server, and that will be loaded in the future
  *              via modules.
diff --git a/src/server.cpp b/src/server.cpp
index 2a0156b11..8bde996b2 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3351,8 +3351,8 @@ int populateCommandTableParseFlags(struct redisCommand *c, const char *strflags)
     return C_OK;
 }
 
-/* Populates the Redis Command Table starting from the hard coded list
- * we have on top of server.c file. */
+/* Populates the KeyDB Command Table starting from the hard coded list
+ * we have on top of server.cpp file. */
 void populateCommandTable(void) {
     int j;
     int numcommands = sizeof(redisCommandTable)/sizeof(struct redisCommand);
diff --git a/src/server.h b/src/server.h
index a84f251de..4fd3b66cb 100644
--- a/src/server.h
+++ b/src/server.h
@@ -352,7 +352,7 @@ extern int configOOMScoreAdjValuesDefaults[CONFIG_OOM_COUNT];
 /* Hash table parameters */
 #define HASHTABLE_MIN_FILL        10      /* Minimal hash table fill 10% */
 
-/* Command flags. Please check the command table defined in the server.c file
+/* Command flags. Please check the command table defined in the server.cpp file
  * for more information about the meaning of every flag. */
 #define CMD_WRITE (1ULL<<0)            /* "write" flag */
 #define CMD_READONLY (1ULL<<1)         /* "read-only" flag */